订单列表bug修改

mall-api/src/main/java/com/txz/mall/constants/Constants.java

@@ -318,19 +318,19 @@ public class Constants {
 
 
     //订单操作类型
-    public static final String ORDER_STATUS_CREATE_ORDER = "create_order"; //创建订单
+    public static final String ORDER_STATUS_CREATE_ORDER = "create_order"; //创建订单 placed on
     public static final String ORDER_STATUS_REMOVE_ORDER = "remove_order"; //删除订单
     public static final String ORDER_STATUS_CANCEL_ORDER = "cancel_order"; //取消订单
     public static final String ORDER_STATUS_PAY_ORDER = "pay_order"; //支付订单
     public static final String ORDER_STATUS_APPLY_REFUND = "apply_refund"; //申请退款
-    public static final String ORDER_STATUS_DELIVERY_ORDER = "delivery"; // 发货
-    public static final String ORDER_STATUS_RECEIVE_ORDER = "receive"; //收货
+    public static final String ORDER_STATUS_DELIVERY_ORDER = "delivery"; // 发货 shipped on
+    public static final String ORDER_STATUS_RECEIVE_ORDER = "receive"; //收货  completed on
     public static final String ORDER_STATUS_SPIKE_ORDER = "send"; //待收货 KEY
 
     public static final String ORDER_STATUS_OPEN_ORDER = "open";// 开团
     public static final String ORDER_STATUS_PINK_ORDER = "pink";// 拼团
     public static final String ORDER_STATUS_PINK_FAIL_ORDER = "pink_fail";// 拼团失败
-    public static final String ORDER_STATUS_PINK_SUCCESS_ORDER = "pink_success"; // 拼团成功
+    public static final String ORDER_STATUS_PINK_SUCCESS_ORDER = "pink_success"; // 拼团成功  对应待发货
 
 
     public static final String ORDER_LOG_REFUND_PRICE = "refund_price"; //退款
@@ -339,7 +339,7 @@ public class Constants {
     public static final String ORDER_LOG_DELIVERY_GOODS = "delivery_goods"; //送货
     public static final String ORDER_LOG_REFUND_REFUSE = "refund_refuse"; //不退款
     public static final String ORDER_LOG_REFUND_APPLY = "apply_refund"; //
-    public static final String ORDER_LOG_PAY_SUCCESS = "pay_success"; //支付成功
+    public static final String ORDER_LOG_PAY_SUCCESS = "pay_success"; //支付成功  paid on
     public static final String ORDER_LOG_DELIVERY_VI = "delivery_fictitious"; //虚拟发货
     public static final String ORDER_LOG_EDIT = "order_edit"; //编辑订单
     public static final String ORDER_LOG_PAY_OFFLINE = "offline"; //线下付款订单

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -1263,14 +1263,19 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         pinkCriteria.andEqualTo("uid", dto.getUserId());
         
         List<StorePink> pinkList = new ArrayList<>();
+
+        List<StoreOrder> list = new ArrayList<>();
+
         if (dto.getType() == null) {
             dto.setType(0);
         }
         switch (dto.getType()) {
             case 0:
+                list = findByCondition(condition);
                 break;
             case 1:
                 criteria.andEqualTo("status", PinkOrderStatusEnum.GROUP_ORDER_TO_PAY.getKey());
+                 list = findByCondition(condition);
                 break;
             case 2:
 //                pinkCriteria.andEqualTo("status", 2);
@@ -1279,29 +1284,32 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                 pinkList = storePinkService.findByCondition(pinkCondition);
                 if (CollUtil.isNotEmpty(pinkList)) {
                     criteria.andIn("id", pinkList.stream().map(StorePink::getOrderIdKey).collect(Collectors.toList()));
+                    list = findByCondition(condition);
                 }
                 break;
             case 3:
-                pinkCriteria.andEqualTo("status", 2);
+                pinkCriteria.andEqualTo("status", StorePinkStatusEnum.RESULTS_ANNOUNCED.getKey());
                 pinkCriteria.andEqualTo("lId", 0);
              //   pinkCriteria.andIn("orderStatus", Arrays.asList(3));
                 pinkList = storePinkService.findByCondition(pinkCondition);
                 if (CollUtil.isNotEmpty(pinkList)) {
                     criteria.andIn("id", pinkList.stream().map(StorePink::getOrderIdKey).collect(Collectors.toList()));
+                    list = findByCondition(condition);
                 }
                 break;
             case 4:
-                pinkCriteria.andEqualTo("status", 2);
-                pinkCriteria.andIn("orderStatus", Arrays.asList(5, 7, 8));
+                pinkCriteria.andEqualTo("status", StorePinkStatusEnum.RESULTS_ANNOUNCED.getKey());
+                pinkCriteria.andIn("orderStatus", Arrays.asList(PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(), PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE.getKey(), PinkOrderStatusEnum.GROUP_ORDER_COMPLETED.getKey()));
                 pinkList = storePinkService.findByCondition(pinkCondition);
                 if (CollUtil.isNotEmpty(pinkList)) {
                     criteria.andIn("id", pinkList.stream().map(StorePink::getOrderIdKey).collect(Collectors.toList()));
+                    list = findByCondition(condition);
                 }
                 break;
             default:
                 break;
         }
-        List<StoreOrder> list = findByCondition(condition);
+
         List<StoreOrderVO> arrayList = new ArrayList<>();
         List<StoreOrderInfo> infoArrayList = new ArrayList<>();
         List<StoreOrderStatus> statusList = new ArrayList<>();