状态国际化和商品筛选

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

@@ -161,7 +161,7 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
         orderCriteria.andEqualTo("isDelete", 0);
         orderCriteria.andBetween("createTime", startDate, endDate);
         List<Integer> statusList = new ArrayList<>();
-        statusList.add(PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE.getKey());
+        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());

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

@@ -67,7 +67,7 @@ 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_RECEIVE.getKey(),
                     PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey()
             );
             criteria.andIn("orderStatus", integers);

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

@@ -1,5 +1,7 @@
 package com.txz.mall.enums;
 
+import com.txz.mall.util.I18nUtil;
+
 import java.util.Objects;
 
 /**
@@ -7,18 +9,14 @@ import java.util.Objects;
  */
 public enum PinkOrderStatusEnum {
 
-    GROUP_ORDER_TO_PAY(1, "拼团待支付"),
-    GROUP_ORDER_CANCELLATION(2, "拼团订单取消"),
-
-    GROUP_ORDER_PAID(3, "拼团已支付"),
-    GROUP_ORDER_REFUND(4, "拼团失败已退款"),   //拼团超时失败  和 拼团成功后用户主动发起退款都会进到这个状态
-
-    GROUP_ORDER_TO_SHIP(5, "拼团待发货"),
-    GROUP_ORDER_TO_CLOSED(6, "拼团未中奖关闭"),
-
-    GROUP_ORDER_TO_RECEVIE(7, "拼团待收货"),
-
-    GROUP_ORDER_COMPLETED(8, "拼团订单完成")
+    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_TO_CLOSED(6, I18nUtil.get("group.order.to.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/service/impl/StoreOrderServiceImpl.java

@@ -947,7 +947,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         criteriaStoreOrder.andEqualTo("isDelete",0);
         List<Integer> list = Arrays.asList(
                 PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(),
-                PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE.getKey(),
+                PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.getKey(),
                 PinkOrderStatusEnum.GROUP_ORDER_COMPLETED.getKey(),
                 PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey(),
                 PinkOrderStatusEnum.GROUP_ORDER_TO_PAY.getKey()
@@ -1347,7 +1347,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                 break;
             case 4:
                 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()));
+                pinkCriteria.andIn("orderStatus", Arrays.asList(PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(), PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.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()));
@@ -2298,7 +2298,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
             Condition condition = new Condition(StoreOrder.class);
             Example.Criteria criteria = condition.createCriteria();
             criteria.andEqualTo("isDelete", 0);
-            criteria.andEqualTo("status", PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE.getKey());
+            criteria.andEqualTo("status", PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.getKey());
             criteria.andLessThanOrEqualTo("deliveryTime", settleTime);
             List<StoreOrder> storeOrderList = findByCondition(condition);
             if(!CollectionUtils.isEmpty(storeOrderList)){

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

@@ -39,10 +39,10 @@ public class I18nUtil
     // 静态 get 方法（同上）
     public static String get(String msgKey) {
         try {
-          //  LocaleContextHolder.setLocale(Locale.US); //英文
+            LocaleContextHolder.setLocale(Locale.US); //英文
 
-            Locale bengaliLocale = new Locale("bn", "BD"); //孟加拉文
-            LocaleContextHolder.setLocale(bengaliLocale);
+          //  Locale bengaliLocale = new Locale("bn", "BD"); //孟加拉文
+         //   LocaleContextHolder.setLocale(bengaliLocale);
 
             return staticMessageSource.getMessage(msgKey, null, LocaleContextHolder.getLocale());
         } catch (Exception e) {

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

@@ -43,14 +43,14 @@ public class OrderStateMachine {
 
         // 待发货状态下的可能转移
         Map<OrderEventsEnum, PinkOrderStatusEnum> pendingReceiptTransitions = new HashMap<>();
-        pendingReceiptTransitions.put(OrderEventsEnum.GROUP_PURCHASE_DELIVER, PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE);
+        pendingReceiptTransitions.put(OrderEventsEnum.GROUP_PURCHASE_DELIVER, PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE);
        // pendingReceiptTransitions.put(OrderEventsEnum.GROUP_PURCHASE_FAIL, PinkOrderStatusEnum.GROUP_ORDER_REFUND); //已支付状态下都可以退款
         transitionTable.put(PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP, pendingReceiptTransitions);
 
         // 待收获态下的可能转移
         Map<OrderEventsEnum, PinkOrderStatusEnum> completedTransitions = new HashMap<>();
         completedTransitions.put(OrderEventsEnum.GROUP_PURCHASE_CONFIRM_RECEIPT, PinkOrderStatusEnum.GROUP_ORDER_COMPLETED);
-        transitionTable.put(PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE, completedTransitions);
+        transitionTable.put(PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE, completedTransitions);
 
 
         // 初始化状态变更动作表
@@ -102,7 +102,7 @@ public class OrderStateMachine {
         refundingActions.put(OrderEventsEnum.GROUP_PURCHASE_CONFIRM_RECEIPT, (order, param) -> {
            // logger.info("订单[{}]订单完成", order.getOrderId());
         });
-        actionTable.put(PinkOrderStatusEnum.GROUP_ORDER_TO_RECEVIE, refundingActions);
+        actionTable.put(PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE, refundingActions);
     }
 
     /**

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

@@ -1 +1,17 @@
-order.does.not.exist=Order does not exist
+order.does.not.exist=Order does not exist
+
+group.order.to.pay=group order to pay
+
+group.order.cancellation=group order cancellation
+
+group.order.paid=group order paid
+
+group.order.refund=group order refund
+
+group.order.to.ship=group order to ship
+
+group.order.to.closed=group order to closed
+
+group.order.to.receive=group order to receive
+
+group.order.completed=group order completed