拼团数量时时统计

mall-service/src/main/java/com/txz/mall/controller/CommonController.java

@@ -34,10 +34,13 @@ public class CommonController {
             id = 1;
         }
         List<EnumBo> list = new ArrayList<>();
+
         switch (id) {
             case 1:
                 list = Arrays.stream(PinkOrderStatusEnum.values())
                         .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build()).collect(Collectors.toList());
+
+
                 break;
 
             default:

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppCommonController.java

@@ -2,6 +2,7 @@ package com.txz.mall.controller.appcontroller;
 
 import com.txz.mall.core.Result;
 import com.txz.mall.enums.PinkOrderStatusEnum;
+import com.txz.mall.util.I18nUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -34,7 +35,7 @@ public class AppCommonController {
         switch (id) {
             case 1:
                 list = Arrays.stream(PinkOrderStatusEnum.values())
-                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(temp.getValue()).build()).collect(Collectors.toList());
+                        .map(temp -> EnumBo.builder().code(temp.getKey()).name(I18nUtil.get("PinkOrderStatusEnum."+temp.name())).build()).collect(Collectors.toList());
                 break;
 
             default:

mall-service/src/main/java/com/txz/mall/enums/PinkOrderStatusEnum.java

@@ -9,16 +9,26 @@ import java.util.Objects;
  */
 public enum PinkOrderStatusEnum {
 
-    GROUP_ORDER_TO_PAY(1, I18nUtil.get("group.order.to.pay")),  //待支付
-    GROUP_ORDER_CANCELLATION(2, I18nUtil.get("group.order.cancellation")),  //已取消
-    GROUP_ORDER_PAID(3, I18nUtil.get("group.order.paid")),   //已支付
-    GROUP_ORDER_REFUND(4, I18nUtil.get("group.order.refund")),   //拼团超时失败  和 拼团成功后用户主动发起退款都会进到这个状态
-    GROUP_ORDER_TO_SHIP(5, I18nUtil.get("group.order.to.ship")),  //待发货
-    GROUP_ORDER_CLOSED(6, I18nUtil.get("group.order.closed")),   //已关闭
-    GROUP_ORDER_TO_RECEIVE(7, I18nUtil.get("group.order.to.receive")),   //待收货
-    GROUP_ORDER_COMPLETED(8, I18nUtil.get("group.order.completed")) //已完成
-
-    ;
+//    GROUP_ORDER_TO_PAY(1, I18nUtil.get("group.order.to.pay")),  //待支付
+//    GROUP_ORDER_CANCELLATION(2, I18nUtil.get("group.order.cancellation")),  //已取消
+//    GROUP_ORDER_PAID(3, I18nUtil.get("group.order.paid")),   //已支付
+//    GROUP_ORDER_REFUND(4, I18nUtil.get("group.order.refund")),   //拼团超时失败  和 拼团成功后用户主动发起退款都会进到这个状态
+//    GROUP_ORDER_TO_SHIP(5, I18nUtil.get("group.order.to.ship")),  //待发货
+//    GROUP_ORDER_CLOSED(6, I18nUtil.get("group.order.closed")),   //已关闭
+//    GROUP_ORDER_TO_RECEIVE(7, I18nUtil.get("group.order.to.receive")),   //待收货
+//    GROUP_ORDER_COMPLETED(8, I18nUtil.get("group.order.completed")) //已完成
+//
+//    ;
+
+
+    GROUP_ORDER_TO_PAY(1, "拼团待支付"),
+    GROUP_ORDER_CANCELLATION(2, "拼团订单取消"),
+    GROUP_ORDER_PAID(3, "拼团已支付"),
+    GROUP_ORDER_REFUND(4, "拼团失败已退款"),   //拼团超时失败  和 拼团成功后用户主动发起退款都会进到这个状态
+    GROUP_ORDER_TO_SHIP(5, "拼团待发货"),
+    GROUP_ORDER_CLOSED(6, "拼团未中奖关闭"),
+    GROUP_ORDER_TO_RECEIVE(7, "拼团待收货"),
+    GROUP_ORDER_COMPLETED(8, "拼团订单完成");
 
     private Integer key;
     private String value;

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

@@ -329,6 +329,7 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
             Example.Criteria criteria = condition.createCriteria();
             criteria.andEqualTo("isDelete", 0);
             criteria.andEqualTo("cid", storePink.getCid());
+            criteria.andEqualTo("orderStatus",PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey());
             //  criteria.andEqualTo("kid", 0);
             criteria.andIn("spsId", spsIdList);
             List<StorePink> pinkList = findByCondition(condition);

mall-service/src/main/resources/i18n/messages_en_US.properties

@@ -1,17 +1,18 @@
 order.does.not.exist=Order does not exist
 
 group.order.to.pay=To Pay
-
+PinkOrderStatusEnum.GROUP_ORDER_TO_PAY=To Pay
 group.order.cancellation=Cancellation
-
+PinkOrderStatusEnum.GROUP_ORDER_CANCELLATION=Cancellation
 group.order.paid=Paid
-
+PinkOrderStatusEnum.GROUP_ORDER_PAID=Paid
 group.order.refund=Refund
-
+PinkOrderStatusEnum.GROUP_ORDER_REFUND=Refund
 group.order.to.ship=To Ship
-
+PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP=To Ship
 group.order.closed=Closed
-
+PinkOrderStatusEnum.GROUP_ORDER_CLOSED=Closed
 group.order.to.receive=To Receive
-
-group.order.completed=Completed
+PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE=To Receive
+group.order.completed=Completed
+PinkOrderStatusEnum.GROUP_ORDER_COMPLETED=Completed