订单详情添加商品状态

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -88,7 +88,8 @@
             oi.product_price item_product_price,
             oi.product_quantity item_product_quantity,
             oi.product_attr item_product_attr,
-            if(oora.status = 2, 1, 0) as item_returnStatus,
+            if(oora.status is null,-1,oora.status) item_returnStatus,
+            if(oora.status = 2, 3, if(o.status = 2, 2, 1))  item_productStatus,
             oh.id history_id,
             oh.operate_man history_operate_man,
             oh.create_time history_create_time,

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrderItem.java

@@ -69,6 +69,9 @@ public class OmsOrderItem implements Serializable {
     @ApiModelProperty("退货状态：-1 ->未退款；0->待处理；1->退货中；2->已完成；3->已拒绝")
     private Integer returnStatus;
 
+    @ApiModelProperty("商品状态：1：待发货，2：已发货，3：已退货")
+    private Integer productStatus;
+
     private BigDecimal precisionAmount;
 
     private static final long serialVersionUID = 1L;
@@ -304,4 +307,12 @@ public class OmsOrderItem implements Serializable {
     public void setReturnStatus(Integer returnStatus) {
         this.returnStatus = returnStatus;
     }
+
+    public Integer getProductStatus() {
+        return productStatus;
+    }
+
+    public void setProductStatus(Integer productStatus) {
+        this.productStatus = productStatus;
+    }
 }

cooleshow-mall/mall-mbg/src/main/resources/config/mybatis/OmsOrderItemMapper.xml

@@ -24,6 +24,7 @@
     <result column="gift_growth" jdbcType="INTEGER" property="giftGrowth" />
     <result column="product_attr" jdbcType="VARCHAR" property="productAttr" />
     <result column="returnStatus" jdbcType="INTEGER" property="returnStatus" />
+    <result column="productStatus" jdbcType="INTEGER" property="productStatus" />
     <result column="promoter_id" jdbcType="INTEGER" property="promoterId" />
     <result column="share_proportion_" jdbcType="INTEGER" property="shareProportion" />
     <result column="precision_amount" jdbcType="INTEGER" property="precisionAmount" />