--no commit message

app/order/src/main/java/com/zrqx/order/commons/vo/fg/FgOrderPageVo.java

@@ -36,6 +36,8 @@ public class FgOrderPageVo {
 	private BigDecimal realReaderCarriage;
 	@ApiModelProperty("是否已整单评价")
 	private String hasComment;
+	@ApiModelProperty("订单类型 1Vip订单2电子订单")
+	private String orderType;
 	@ApiModelProperty("订单详情列表")
 	private List<FgOrderInfoPageVo> infoList;
 	

app/order/src/main/java/com/zrqx/order/fg/mapper/FgOrderMapper.java

@@ -140,12 +140,12 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	 * @date: 2019年1月28日 上午11:47:30
 	 */
 	@Select (" <script> "
-			+ " select o.id,o.code,o.createTime,o.status,o.payment,o.realReaderCarriage,o.hasComment from ord_order o, ord_orderinfo i "
+			+ " select o.id,o.code,o.createTime,o.status,o.payment,o.orderType,o.realReaderCarriage,o.hasComment from ord_order o, ord_orderinfo i "
 			+ " where o.display = 1 and o.orderType = 2 and o.creater = #{memberId} and o.id = i.orderid "
 			+ DEFAULT_PARAM
 			+ DEFAULT_SQL
 			+"union "
-			+ "select o.id,o.code,o.createTime,o.status,o.payment,o.realReaderCarriage,o.hasComment from ord_order o, ord_orderinfo i "
+			+ "select o.id,o.code,o.createTime,o.status,o.payment,o.orderType,o.realReaderCarriage,o.hasComment from ord_order o, ord_orderinfo i "
 			+ " where o.display = 1 and o.orderType = 1 and o.status = 6 and o.creater = #{memberId} and o.id = i.orderid "
 			+ DEFAULT_PARAM
 			+ DEFAULT_SQL