状态国际化和商品筛选

mall-service/src/main/java/com/txz/mall/business/impl/OrderServiceBusinessImpl.java

@@ -164,7 +164,7 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
         statusList.add(PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.getKey());
         statusList.add(PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey());
         statusList.add(PinkOrderStatusEnum.GROUP_ORDER_COMPLETED.getKey());
-        statusList.add(PinkOrderStatusEnum.GROUP_ORDER_TO_CLOSED.getKey());
+        statusList.add(PinkOrderStatusEnum.GROUP_ORDER_CLOSED.getKey());
         orderCriteria.andIn("status", statusList);
         List<StoreOrder> orderList = storeOrderService.findByCondition(orderCondition);
         Map<Long, Long> combinationCountMap = orderList.stream()

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

@@ -64,7 +64,7 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
             criteria.andEqualTo("isDelete", 0);
             criteria.andEqualTo("spsId", storePink.getSpsId());
             ArrayList<Integer> integers = CollUtil.newArrayList(
-                    PinkOrderStatusEnum.GROUP_ORDER_TO_CLOSED.getKey(),
+                    PinkOrderStatusEnum.GROUP_ORDER_CLOSED.getKey(),
                     PinkOrderStatusEnum.GROUP_ORDER_COMPLETED.getKey(),
                     PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(),
                     PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.getKey(),

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

@@ -14,7 +14,7 @@ public enum PinkOrderStatusEnum {
     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_TO_CLOSED(6, I18nUtil.get("group.order.to.closed")),
+    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"))
 

mall-service/src/main/java/com/txz/mall/util/OrderStateMachine.java

@@ -37,7 +37,7 @@ public class OrderStateMachine {
         // 已支付状态下的可能转移
         Map<OrderEventsEnum, PinkOrderStatusEnum> pendingDeliveryTransitions = new HashMap<>();
         pendingDeliveryTransitions.put(OrderEventsEnum.GROUP_PURCHASE_FAIL, PinkOrderStatusEnum.GROUP_ORDER_REFUND);//已支付状态下都可以退款
-        pendingDeliveryTransitions.put(OrderEventsEnum.GROUP_PURCHASE_NOT_WIN, PinkOrderStatusEnum.GROUP_ORDER_TO_CLOSED);
+        pendingDeliveryTransitions.put(OrderEventsEnum.GROUP_PURCHASE_NOT_WIN, PinkOrderStatusEnum.GROUP_ORDER_CLOSED);
         pendingDeliveryTransitions.put(OrderEventsEnum.GROUP_PURCHASE_WIN, PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP);
         transitionTable.put(PinkOrderStatusEnum.GROUP_ORDER_PAID, pendingDeliveryTransitions);
 

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

@@ -10,7 +10,7 @@ group.order.refund=Refund
 
 group.order.to.ship=To ship
 
-group.order.to.closed=To closed
+group.order.closed=Closed
 
 group.order.to.receive=To receive