fixed 订单枚举类优化

fuint-application/src/main/java/com/fuint/common/enums/OrderStatusEnum.java

@@ -49,6 +49,15 @@ public enum OrderStatusEnum {
         this.value = value;
     }
 
+    public static String getValue(String k) {
+        for (OrderStatusEnum c : OrderStatusEnum.values()) {
+            if (c.getKey().equals(k)) {
+                return c.getValue();
+            }
+        }
+        return null;
+    }
+
     public static List<ParamDto> getOrderStatusList() {
         return Arrays.stream(OrderStatusEnum.values())
                 .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))

fuint-application/src/main/java/com/fuint/common/enums/OrderTypeEnum.java

@@ -51,7 +51,7 @@ public enum OrderTypeEnum {
      * @param key
      * @return
      */
-    public static String getName(String key) {
+    public static String getValue(String key) {
         final OrderTypeEnum[] values = OrderTypeEnum.values();
         for (OrderTypeEnum value : values) {
             if (key.equals(value.getKey())) {

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -1674,37 +1674,8 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             userOrderDto.setPayTime(DateUtil.formatDate(orderInfo.getPayTime(), "yyyy.MM.dd HH:mm"));
         }
 
-        if (userOrderDto.getType().equals(OrderTypeEnum.PRESTORE.getKey())) {
-            userOrderDto.setTypeName(OrderTypeEnum.PRESTORE.getValue());
-        } else if(userOrderDto.getType().equals(OrderTypeEnum.PAYMENT.getKey())) {
-            userOrderDto.setTypeName(OrderTypeEnum.PAYMENT.getValue());
-        } else if(userOrderDto.getType().equals(OrderTypeEnum.GOODS.getKey())) {
-            userOrderDto.setTypeName(OrderTypeEnum.GOODS.getValue());
-        } else if(userOrderDto.getType().equals(OrderTypeEnum.MEMBER.getKey())) {
-            userOrderDto.setTypeName(OrderTypeEnum.MEMBER.getValue());
-        } else if(userOrderDto.getType().equals(OrderTypeEnum.RECHARGE.getKey())) {
-            userOrderDto.setTypeName(OrderTypeEnum.RECHARGE.getValue());
-        }
-
-        if (userOrderDto.getStatus().equals(OrderStatusEnum.CREATED.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.CREATED.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.CANCEL.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.CANCEL.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.PAID.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.PAID.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.DELIVERY.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.DELIVERY.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.DELIVERED.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.DELIVERED.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.RECEIVED.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.RECEIVED.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.DELETED.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.DELETED.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.REFUND.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.REFUND.getValue());
-        } else if(userOrderDto.getStatus().equals(OrderStatusEnum.COMPLETE.getKey())) {
-            userOrderDto.setStatusText(OrderStatusEnum.COMPLETE.getValue());
-        }
+        userOrderDto.setTypeName(OrderTypeEnum.getValue(userOrderDto.getType()));
+        userOrderDto.setStatusText(OrderStatusEnum.getValue(userOrderDto.getStatus()));
 
         // 订单所属店铺
         MtStore storeInfo = storeService.queryStoreById(orderInfo.getStoreId());