fix 小程序金币支付

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -78,4 +78,7 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private String telphone;
 
+    /** 订单类型 1充值订单 2消费订单 */
+    private Integer orderType;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -237,6 +237,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         String out_trade_no = DateUtils.getDateOrderSn();
         add.setOderSn(out_trade_no);
         add.setPayType(3); //金币支付
+        add.setOrderType(2);
         BigDecimal totalPrice = new BigDecimal(0);
         Boolean couponBool = true;
         for (OrderGoodsAddBo g : goodsList) {
@@ -400,6 +401,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setOderSn(out_trade_no);
         add.setPayType(1); //微信支付
         add.setOrderStatus(0);
+        add.setOrderType(1);
         BigDecimal totalPrice = new BigDecimal(0);
         for (OrderGoodsAddBo g : goodsList) {
             g.setOrderSn(out_trade_no);
@@ -436,6 +438,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setOderSn(out_trade_no);
         add.setPayType(1); //微信支付
         add.setOrderStatus(0);
+        add.setOrderType(1);
         BigDecimal totalPrice = new BigDecimal(0);
         for (OrderGoodsAddBo g : goodsList) {
             g.setOrderSn(out_trade_no);

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderVo.java

@@ -66,4 +66,8 @@ public class OrderVo {
 	@ApiModelProperty("订单完成时间")
 	private Long finishTime;
 
+	/** 订单类型 1充值订单 2消费订单 */
+	@Excel(name = "订单类型")
+	@ApiModelProperty("订单类型 1充值订单 2消费订单")
+	private Integer orderType;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="transid" column="transid"/>
         <result property="cancelTime" column="cancel_time"/>
         <result property="finishTime" column="finish_time"/>
+        <result property="orderType" column="order_type"/>
         <result property="telphone" column="telphone"/>
         <collection property="goodsList" ofType="com.zhongzheng.modules.order.domain.OrderGoods" column="orderSn">
             <result property="goodsType" column="goods_type"/>