Browse Source

成团如参调整

yubin 6 ngày trước cách đây
mục cha
commit
526fcc2058

+ 4 - 3
mall-service/src/main/java/com/txz/mall/business/impl/PinkServiceBusinessImpl.java

@@ -57,7 +57,7 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
             throw new ServiceException("拼团数据不存在id:"+pinkId);
         }
         List<StorePinkDetailVO> resultList = new ArrayList<>();
-        if (StorePinkStatusEnum.RESULTS_ANNOUNCED.getKey().equals(storePink.getStatus())) {
+      //  if (StorePinkStatusEnum.RESULTS_ANNOUNCED.getKey().equals(storePink.getStatus())) {
 
             Condition condition = new Condition(StorePink.class);
             Example.Criteria criteria = condition.createCriteria();
@@ -67,7 +67,8 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
                     PinkOrderStatusEnum.GROUP_ORDER_TO_CLOSED.getKey(),
                     PinkOrderStatusEnum.GROUP_ORDER_COMPLETED.getKey(),
                     PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(),
-                    PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE.getKey()
+                    PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE.getKey(),
+                    PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey()
             );
             criteria.andIn("orderStatus", integers);
 //        criteria.andEqualTo("kId", pinkId);
@@ -142,7 +143,7 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
                     resultList.add(storePinkDetailVO);
                 }
             }
-        }
+      //  }
 
         return resultList;
     }