浏览代码

Merge branch 'feature/0613-opt' into test

yuanliang 8 月之前
父节点
当前提交
4f1c684728
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

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

@@ -89,7 +89,7 @@
             oi.product_quantity item_product_quantity,
             oi.product_attr item_product_attr,
             if(oora.status is null,-1,oora.status) item_returnStatus,
-            if(oora.status = 2, 3, if(o.status = 2, 2, 1))  item_productStatus,
+            if(oora.status = 1, 4,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,