fix 商品状态

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -40,4 +40,13 @@ public class OrderGoodsAddBo {
     /**  状态 1正常 0关闭 -1有退款 */
     @ApiModelProperty(" 状态 1正常 0关闭 -1有退款")
     private Integer status;
+    /** 已收金额 */
+    @ApiModelProperty("已收金额")
+    private BigDecimal goodsReceived;
+    /** 退款状态 0无  1退款中 2已退款 3拒绝退款 */
+    @ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
+    private Integer refundStatus;
+    /** 支付状态 1未收费 2部分收费 3完全收费 */
+    @ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
+    private Integer payStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsEditBo.java

@@ -53,5 +53,16 @@ public class OrderGoodsEditBo {
     /**  状态 1正常 0关闭 -1有退款 */
     @ApiModelProperty(" 状态 1正常 0关闭 -1有退款")
     private Integer status;
+    /** 已收金额 */
+    @ApiModelProperty("已收金额")
+    private BigDecimal goodsReceived;
+
+    /** 退款状态 0无  1退款中 2已退款 3拒绝退款 */
+    @ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
+    private Integer refundStatus;
+
+    /** 支付状态 1未收费 2部分收费 3完全收费 */
+    @ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
+    private Integer payStatus;
 
 }

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

@@ -43,4 +43,10 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /**  状态 1正常 0关闭 -1有退款 */
     private Integer status;
+    /** 已收金额 */
+    private BigDecimal goodsReceived;
+    /** 退款状态 0无  1退款中 2已退款 3拒绝退款 */
+    private Integer refundStatus;
+    /** 支付状态 1未收费 2部分收费 3完全收费 */
+    private Integer payStatus;
 }

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

@@ -61,4 +61,17 @@ public class OrderGoodsVo {
 	@Excel(name = " 状态 1正常 0关闭 -1有退款")
 	@ApiModelProperty(" 状态 1正常 0关闭 -1有退款")
 	private Integer status;
+
+	/** 已收金额 */
+	@Excel(name = "已收金额")
+	@ApiModelProperty("已收金额")
+	private BigDecimal goodsReceived;
+	/** 退款状态 0无  1退款中 2已退款 3拒绝退款 */
+	@Excel(name = "退款状态 0无  1退款中 2已退款 3拒绝退款")
+	@ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
+	private Integer refundStatus;
+	/** 支付状态 1未收费 2部分收费 3完全收费 */
+	@Excel(name = "支付状态 1未收费 2部分收费 3完全收费")
+	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
+	private Integer payStatus;
 }

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

@@ -122,4 +122,21 @@ public class OrderListVo {
 	@Excel(name = "手机号码")
 	@ApiModelProperty("手机号码")
 	private String telphone;
+
+	@Excel(name = "订单商品状态")
+	@ApiModelProperty("订单商品状态   1正常 0关闭  2退款中 3已退款 4拒绝退款")
+	private Integer orderGoodsStatus;
+
+	/** 已收金额 */
+	@Excel(name = "已收金额")
+	@ApiModelProperty("已收金额")
+	private BigDecimal goodsReceived;
+	/** 退款状态 0无  1退款中 2已退款 3拒绝退款 */
+	@Excel(name = "退款状态 0无  1退款中 2已退款 3拒绝退款")
+	@ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
+	private Integer refundStatus;
+	/** 支付状态 1未收费 2部分收费 3完全收费 */
+	@Excel(name = "支付状态 1未收费 2部分收费 3完全收费")
+	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
+	private Integer payStatus;
 }

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

@@ -14,6 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="goodsReceived" column="goods_received"/>
+        <result property="refundStatus" column="refund_status"/>
+        <result property="payStatus" column="pay_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="OrderGoodsResultVo">
@@ -24,6 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsPrice" column="goods_price"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
         <result property="status" column="status"/>
+        <result property="goodsReceived" column="goods_received"/>
+        <result property="refundStatus" column="refund_status"/>
+        <result property="payStatus" column="pay_status"/>
 
         <result property="code" column="code"/>
         <result property="goodsName" column="goods_name"/>

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

@@ -55,10 +55,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="goodsPrice" column="goods_price"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
+        <result property="orderGoodsStatus" column="order_goods_status"/>
 
         <result property="idCard" column="id_card"/>
         <result property="telphone" column="telphone"/>
         <result property="realname" column="realname"/>
+
+        <result property="goodsReceived" column="goods_received"/>
+        <result property="refundStatus" column="refund_status"/>
+        <result property="payStatus" column="pay_status"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderResultVo">
@@ -76,7 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cpt.project_name,
             cb.business_name,
             s.school_name,
-            m.category_name
+            m.category_name,
+            og.goodsReceived,
+            og.refundStatus,
+            og.payStatus
         FROM
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn