fixed 订单核销和枚举类代码优化

fuint-application/src/main/java/com/fuint/common/dto/ParamDto.java

@@ -1,9 +1,7 @@
 package com.fuint.common.dto;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
+import lombok.Data;
 import java.io.Serializable;
 
 /**
@@ -12,8 +10,7 @@ import java.io.Serializable;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-@Getter
-@Setter
+@Data
 public class ParamDto implements Serializable {
 
     @ApiModelProperty("参数键值")
@@ -25,4 +22,9 @@ public class ParamDto implements Serializable {
     @ApiModelProperty("参数值")
     private String value;
 
+    public ParamDto(String key, String name, String value) {
+       this.key = key;
+       this.name = name;
+       this.value = value;
+    }
 }

fuint-application/src/main/java/com/fuint/common/dto/UserOrderDto.java

@@ -9,6 +9,7 @@ import lombok.Setter;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -138,5 +139,14 @@ public class UserOrderDto implements Serializable {
     @ApiModelProperty("所属员工")
     private MtStaff staffInfo;
 
+    @ApiModelProperty("核销状态")
+    private String confirmStatus;
+
+    @ApiModelProperty("核销时间")
+    private String confirmTime;
+
+    @ApiModelProperty("核销备注")
+    private String confirmRemark;
+
 }
 

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 预约订单状态枚举
  *
@@ -38,4 +44,10 @@ public enum BookStatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getBookStatusList() {
+        return Arrays.stream(BookStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 分佣结算状态
  *
@@ -36,4 +42,10 @@ public enum CommissionCashStatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getCommissionCashStatusList() {
+        return Arrays.stream(CommissionCashStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 分佣状态
  *
@@ -35,4 +41,10 @@ public enum CommissionStatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getCommissionStatusList() {
+        return Arrays.stream(CommissionStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 分佣对象枚举
  *
@@ -34,4 +40,10 @@ public enum CommissionTargetEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getCommissionTargetList() {
+        return Arrays.stream(CommissionTargetEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 分佣提成类型
  *
@@ -7,7 +13,7 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum CommissionTypeEnum {
-    GOOGS("goods", "商品订单"),
+    GOODS("goods", "商品订单"),
     PAYMENT("payment", "付款订单"),
     RECHARGE("recharge", "充值订单");
 
@@ -51,4 +57,10 @@ public enum CommissionTypeEnum {
         }
         return null;
     }
+
+    public static List<ParamDto> getCommissionTypeList() {
+        return Arrays.stream(CommissionTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 卡券类型枚举
  *
@@ -35,4 +41,10 @@ public enum CouponTypeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getCouponTypeList() {
+        return Arrays.stream(CouponTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 卡券使用专项枚举
  *
@@ -54,4 +60,10 @@ public enum CouponUseForEnum {
         }
         return null;
     }
+
+    public static List<ParamDto> getCouponUseForList() {
+        return Arrays.stream(CouponUseForEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 物流公司枚举
  *
@@ -7,6 +13,7 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum ExpressCompanyEnum {
+
     SELF("SELF", "商家自送"),
     YTO("YTO", "圆通速递"),
     ZTO("ZTO", "中通快递"),
@@ -44,4 +51,10 @@ public enum ExpressCompanyEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getExpressCompanyList() {
+        return Arrays.stream(ExpressCompanyEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 商品类型
  *
@@ -55,4 +61,10 @@ public enum GoodsTypeEnum {
         }
         return null;
     }
+
+    public static List<ParamDto> getGoodsTypeList() {
+        return Arrays.stream(GoodsTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 商户类型枚举
  *
@@ -36,4 +42,10 @@ public enum MerchantTypeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getMerchantTypeList() {
+        return Arrays.stream(MerchantTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 订单模式
  *
@@ -34,4 +40,10 @@ public enum OrderModeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getOrderModeList() {
+        return Arrays.stream(OrderModeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 订单状态枚举
  *
@@ -7,6 +13,7 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum OrderStatusEnum {
+
     CREATED("A", "待支付"),
     PAID("B", "已支付"),
     CANCEL("C", "已取消"),
@@ -40,4 +47,10 @@ public enum OrderStatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getOrderStatusList() {
+        return Arrays.stream(OrderStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 订单类型
  *
@@ -7,7 +13,8 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum OrderTypeEnum {
-    GOOGS("goods", "商品订单"),
+
+    GOODS("goods", "商品订单"),
     PAYMENT("payment", "付款订单"),
     RECHARGE("recharge", "充值订单"),
     PRESTORE("prestore", "储值卡订单"),
@@ -53,4 +60,10 @@ public enum OrderTypeEnum {
         }
         return null;
     }
+
+    public static List<ParamDto> getOrderTypeList() {
+        return Arrays.stream(OrderTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getKey()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 支付状态
  *
@@ -34,4 +40,10 @@ public enum PayStatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getPayStatusList() {
+        return Arrays.stream(PayStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 支付类型
  *
@@ -7,6 +13,7 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum PayTypeEnum {
+
     CASH("CASH", "现金支付"),
     JSAPI("JSAPI", "微信支付"),
     MICROPAY("MICROPAY", "微信扫码支付"),
@@ -38,4 +45,10 @@ public enum PayTypeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getPayTypeList() {
+        return Arrays.stream(PayTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 售后订单状态枚举
  *
@@ -38,4 +44,10 @@ public enum RefundStatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getRefundStatusList() {
+        return Arrays.stream(RefundStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 售后类型枚举
  *
@@ -35,4 +41,10 @@ public enum RefundTypeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getRefundTypeList() {
+        return Arrays.stream(RefundTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 订单结算状态
  *
@@ -34,4 +40,10 @@ public enum SettleStatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getSettleStatusList() {
+        return Arrays.stream(SettleStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 员工类别枚举
  *
@@ -75,4 +81,10 @@ public enum StaffCategoryEnum {
         }
         return null;
     }
+
+    public static List<ParamDto> getStaffCategoryList() {
+        return Arrays.stream(StaffCategoryEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 通用状态枚举
  *
@@ -38,4 +44,10 @@ public enum StatusEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getStatusList() {
+        return Arrays.stream(StatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 用户卡券状态
  *
@@ -57,4 +63,10 @@ public enum UserCouponStatusEnum {
         }
         return null;
     }
+
+    public static List<ParamDto> getUserCouponStatusList() {
+        return Arrays.stream(UserCouponStatusEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -1,5 +1,11 @@
 package com.fuint.common.enums;
 
+import com.fuint.common.dto.ParamDto;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 升级会员等级条件枚举
  *
@@ -36,4 +42,10 @@ public enum UserGradeCatchTypeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public static List<ParamDto> getUserGradeCatchTypeList() {
+        return Arrays.stream(UserGradeCatchTypeEnum.values())
+                .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
+                .collect(Collectors.toList());
+    }
 }

fuint-application/src/main/java/com/fuint/common/param/OrderListParam.java

@@ -40,6 +40,9 @@ public class OrderListParam extends PageParam implements Serializable {
     @ApiModelProperty(value="结算状态", name="settleStatus")
     private String settleStatus;
 
+    @ApiModelProperty(value="核销状态", name="confirmStatus")
+    private String confirmStatus;
+
     @ApiModelProperty(value="数据类型，1）toPay：待支付；2）paid：已支付；3）cancel：已取消", name="dataType")
     private String dataType;
 

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

@@ -193,7 +193,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
         if (orderId != null && orderId > 0) {
             MtOrder mtOrder = orderService.getById(orderId);
             // 商品订单佣金计算
-            if (mtOrder != null && mtOrder.getType().equals(CommissionTypeEnum.GOOGS.getKey())) {
+            if (mtOrder != null && mtOrder.getType().equals(CommissionTypeEnum.GOODS.getKey())) {
                 // 获取分销关系
                 Integer commissionUserId = mtCommissionRelationMapper.getCommissionUserId(mtOrder.getMerchantId(), mtOrder.getUserId());
                 if (commissionUserId != null && commissionUserId > 0) {
@@ -210,7 +210,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
                          LambdaQueryWrapper<MtCommissionRuleItem> lambdaQueryWrapper = Wrappers.lambdaQuery();
                          lambdaQueryWrapper.eq(MtCommissionRuleItem::getMerchantId, mtOrder.getMerchantId());
                          lambdaQueryWrapper.eq(MtCommissionRuleItem::getTargetId, goodsId);
-                         lambdaQueryWrapper.eq(MtCommissionRuleItem::getType, CommissionTypeEnum.GOOGS.getKey());
+                         lambdaQueryWrapper.eq(MtCommissionRuleItem::getType, CommissionTypeEnum.GOODS.getKey());
                          lambdaQueryWrapper.eq(MtCommissionRuleItem::getStatus, StatusEnum.ENABLED.getKey());
                          lambdaQueryWrapper.orderByDesc(MtCommissionRuleItem::getId);
                          List<MtCommissionRuleItem> commissionRuleItemList = mtCommissionRuleItemMapper.selectList(lambdaQueryWrapper);

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

@@ -199,6 +199,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         String startTime = orderListParam.getStartTime() == null ? "" : orderListParam.getStartTime();
         String endTime = orderListParam.getEndTime() == null ? "" : orderListParam.getEndTime();
         String keyword = orderListParam.getKeyword() == null ? "" : orderListParam.getKeyword();
+        String confirmStatus = orderListParam.getConfirmStatus() == null ? "" : orderListParam.getConfirmStatus();
         List<String> payType = orderListParam.getPayType();
 
         LambdaQueryWrapper<MtOrder> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -215,12 +216,12 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             // 待核销
             payStatus = PayStatusEnum.SUCCESS.getKey();
             lambdaQueryWrapper.eq(MtOrder::getConfirmStatus, YesOrNoEnum.NO.getKey());
-            lambdaQueryWrapper.eq(MtOrder::getType, OrderTypeEnum.GOOGS.getKey());
+            lambdaQueryWrapper.eq(MtOrder::getType, OrderTypeEnum.GOODS.getKey());
             lambdaQueryWrapper.eq(MtOrder::getOrderMode, OrderModeEnum.ONESELF.getKey());
         } else if(dataType.equals("confirm")) {
             // 已核销
             payStatus = PayStatusEnum.SUCCESS.getKey();
-            lambdaQueryWrapper.eq(MtOrder::getType, OrderTypeEnum.GOOGS.getKey());
+            lambdaQueryWrapper.eq(MtOrder::getType, OrderTypeEnum.GOODS.getKey());
             lambdaQueryWrapper.eq(MtOrder::getConfirmStatus, YesOrNoEnum.YES.getKey());
             lambdaQueryWrapper.eq(MtOrder::getOrderMode, OrderModeEnum.ONESELF.getKey());
         }
@@ -292,6 +293,11 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         if (payType != null && payType.size() > 0) {
             lambdaQueryWrapper.in(MtOrder::getPayType, payType);
         }
+        if (StringUtil.isNotEmpty(confirmStatus)) {
+            lambdaQueryWrapper.eq(MtOrder::getConfirmStatus, confirmStatus);
+            lambdaQueryWrapper.eq(MtOrder::getPayStatus, PayStatusEnum.SUCCESS.getKey());
+            lambdaQueryWrapper.eq(MtOrder::getType, OrderTypeEnum.GOODS.getKey());
+        }
         lambdaQueryWrapper.orderByDesc(MtOrder::getId);
         Page<MtOpenGift> pageHelper = PageHelper.startPage(pageNumber, pageSize);
         List<MtOrder> orderList = mtOrderMapper.selectList(lambdaQueryWrapper);
@@ -425,7 +431,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         // 计算商品订单总金额
         List<MtCart> cartList = new ArrayList<>();
         Map<String, Object> cartData = new HashMap<>();
-        if (orderDto.getType().equals(OrderTypeEnum.GOOGS.getKey())) {
+        if (orderDto.getType().equals(OrderTypeEnum.GOODS.getKey())) {
             if (StringUtil.isNotEmpty(orderDto.getCartIds())) {
                 Map<String, Object> param = new HashMap<>();
                 param.put("status", StatusEnum.ENABLED.getKey());
@@ -541,7 +547,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         // 如果是商品订单，生成订单商品
-        if (orderDto.getType().equals(OrderTypeEnum.GOOGS.getKey()) && cartList.size() > 0) {
+        if (orderDto.getType().equals(OrderTypeEnum.GOODS.getKey()) && cartList.size() > 0) {
             Object listObject = cartData.get("list");
             List<ResCartDto> lists =(ArrayList<ResCartDto>)listObject;
             BigDecimal memberDiscount = new BigDecimal("0");
@@ -849,12 +855,12 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         // 商品订单
-        if (orderDto.getType().equals(OrderTypeEnum.GOOGS.getKey())) {
+        if (orderDto.getType().equals(OrderTypeEnum.GOODS.getKey())) {
             orderDto.setCouponId(couponId);
         }
 
         // 商品订单且配送要加上配送费用
-        if (orderDto.getType().equals(OrderTypeEnum.GOOGS.getKey()) && orderDto.getOrderMode().equals(OrderModeEnum.EXPRESS.getKey())) {
+        if (orderDto.getType().equals(OrderTypeEnum.GOODS.getKey()) && orderDto.getOrderMode().equals(OrderModeEnum.EXPRESS.getKey())) {
             MtSetting mtSetting = settingService.querySettingByName(merchantId, SettingTypeEnum.ORDER.getKey(), OrderSettingEnum.DELIVERY_FEE.getKey());
             if (mtSetting != null && StringUtil.isNotEmpty(mtSetting.getValue())) {
                 BigDecimal deliveryFee = new BigDecimal(mtSetting.getValue());
@@ -1315,7 +1321,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         if (null != orderDto.getVerifyCode() && StringUtil.isNotEmpty(orderDto.getVerifyCode())) {
-            if (orderDto.getVerifyCode().equals(mtOrder.getVerifyCode())) {
+            if (orderDto.getVerifyCode().equals(mtOrder.getVerifyCode()) || StringUtil.isEmpty(mtOrder.getVerifyCode())) {
                 mtOrder.setStatus(OrderStatusEnum.DELIVERED.getKey());
                 mtOrder.setVerifyCode("");
             } else {
@@ -1421,7 +1427,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
         // 处理购物订单
         UserOrderDto orderInfo = getOrderByOrderSn(mtOrder.getOrderSn());
-        if (orderInfo.getType().equals(OrderTypeEnum.GOOGS.getKey())) {
+        if (orderInfo.getType().equals(OrderTypeEnum.GOODS.getKey())) {
             try {
                 List<OrderGoodsDto> goodsList = orderInfo.getGoods();
                 if (goodsList != null && goodsList.size() > 0) {
@@ -1486,7 +1492,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         // 计算是否要升级（购物订单、付款订单、充值订单）
-        if (orderInfo.getIsVisitor().equals(YesOrNoEnum.NO.getKey()) && orderInfo.getType().equals(OrderTypeEnum.GOOGS.getKey()) || orderInfo.getType().equals(OrderTypeEnum.PAYMENT.getKey()) || orderInfo.getType().equals(OrderTypeEnum.RECHARGE.getKey())) {
+        if (orderInfo.getIsVisitor().equals(YesOrNoEnum.NO.getKey()) && orderInfo.getType().equals(OrderTypeEnum.GOODS.getKey()) || orderInfo.getType().equals(OrderTypeEnum.PAYMENT.getKey()) || orderInfo.getType().equals(OrderTypeEnum.RECHARGE.getKey())) {
             try {
                 if (orderInfo.getIsVisitor().equals(YesOrNoEnum.NO.getKey())) {
                     Map<String, Object> param = new HashMap<>();
@@ -1587,12 +1593,16 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         userOrderDto.setVerifyCode("");
         userOrderDto.setDeliveryFee(orderInfo.getDeliveryFee());
         userOrderDto.setPlatform(orderInfo.getPlatform());
+        userOrderDto.setConfirmRemark(orderInfo.getConfirmRemark());
+        userOrderDto.setConfirmStatus(orderInfo.getConfirmStatus());
+        if (orderInfo.getConfirmTime() != null) {
+            userOrderDto.setConfirmTime(DateUtil.formatDate(orderInfo.getConfirmTime(), "yyyy.MM.dd HH:mm"));
+        }
 
-        // 核销码为空，说明已经核销
-        if (orderInfo.getVerifyCode() == null || StringUtil.isEmpty(orderInfo.getVerifyCode())) {
-            userOrderDto.setIsVerify(true);
-        } else {
+        if (orderInfo.getType().equals(OrderTypeEnum.GOODS.getKey()) && orderInfo.getPayStatus().equals(PayStatusEnum.SUCCESS.getKey()) && orderInfo.getConfirmStatus().equals(YesOrNoEnum.NO.getKey())) {
             userOrderDto.setIsVerify(false);
+        } else {
+            userOrderDto.setIsVerify(true);
         }
 
         if (orderInfo.getPayAmount() != null) {
@@ -1630,8 +1640,8 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             userOrderDto.setTypeName(OrderTypeEnum.PRESTORE.getValue());
         } else if(userOrderDto.getType().equals(OrderTypeEnum.PAYMENT.getKey())) {
             userOrderDto.setTypeName(OrderTypeEnum.PAYMENT.getValue());
-        } else if(userOrderDto.getType().equals(OrderTypeEnum.GOOGS.getKey())) {
-            userOrderDto.setTypeName(OrderTypeEnum.GOOGS.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())) {
@@ -1710,7 +1720,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         // 商品订单
-        if (orderInfo.getType().equals(OrderTypeEnum.GOOGS.getKey())) {
+        if (orderInfo.getType().equals(OrderTypeEnum.GOODS.getKey())) {
             Map<String, Object> params = new HashMap<>();
             params.put("ORDER_ID", orderInfo.getId());
             List<MtOrderGoods> orderGoodsList = mtOrderGoodsMapper.selectByMap(params);
@@ -1723,7 +1733,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                     if (goodsInfo.getLogo().indexOf(baseImage) == -1) {
                         orderGoodsDto.setImage(baseImage + goodsInfo.getLogo());
                     }
-                    orderGoodsDto.setType(OrderTypeEnum.GOOGS.getKey());
+                    orderGoodsDto.setType(OrderTypeEnum.GOODS.getKey());
                     orderGoodsDto.setNum(orderGoods.getNum());
                     orderGoodsDto.setSkuId(orderGoods.getSkuId());
                     orderGoodsDto.setPrice(orderGoods.getPrice().toString());

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

@@ -181,26 +181,17 @@ public class SettingServiceImpl extends ServiceImpl<MtSettingMapper, MtSetting>
         List<ParamDto> payTypeList = new ArrayList<>();
 
         // 微信jsapi
-        ParamDto jsApi = new ParamDto();
-        jsApi.setKey(PayTypeEnum.JSAPI.getKey());
-        jsApi.setValue(PayTypeEnum.JSAPI.getKey());
-        jsApi.setName(PayTypeEnum.JSAPI.getValue());
+        ParamDto jsApi = new ParamDto(PayTypeEnum.JSAPI.getKey(), PayTypeEnum.JSAPI.getValue(), PayTypeEnum.JSAPI.getKey());
         payTypeList.add(jsApi);
 
         // 余额支付
-        ParamDto balance = new ParamDto();
-        balance.setKey(PayTypeEnum.BALANCE.getKey());
-        balance.setValue(PayTypeEnum.BALANCE.getKey());
-        balance.setName(PayTypeEnum.BALANCE.getValue());
+        ParamDto balance = new ParamDto(PayTypeEnum.BALANCE.getKey(), PayTypeEnum.BALANCE.getValue(), PayTypeEnum.BALANCE.getKey());
         payTypeList.add(balance);
 
         // 前台支付
         MtSetting mtSetting = settingService.querySettingByName(merchantId, storeId,  SettingTypeEnum.ORDER.getKey(), OrderSettingEnum.PAY_OFF_LINE.getKey());
         if (mtSetting != null && mtSetting.getValue().equals(YesOrNoEnum.YES.getKey())) {
-            ParamDto store = new ParamDto();
-            store.setKey(PayTypeEnum.STORE.getKey());
-            store.setValue(PayTypeEnum.STORE.getKey());
-            store.setName(PayTypeEnum.STORE.getValue());
+            ParamDto store = new ParamDto(PayTypeEnum.STORE.getKey(), PayTypeEnum.STORE.getValue(), PayTypeEnum.STORE.getKey());
             payTypeList.add(store);
         }
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBookItemController.java

@@ -26,7 +26,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -128,15 +127,7 @@ public class BackendBookItemController extends BaseController {
         String imagePath = settingService.getUploadBasePath();
 
         // 预约状态列表
-        BookStatusEnum[] bookStatusEnum = BookStatusEnum.values();
-        List<ParamDto> bookStatusList = new ArrayList<>();
-        for (BookStatusEnum enumItem : bookStatusEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            bookStatusList.add(paramDto);
-        }
+        List<ParamDto> bookStatusList = BookStatusEnum.getBookStatusList();
 
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionCashController.java

@@ -24,7 +24,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -124,15 +123,7 @@ public class BackendCommissionCashController extends BaseController {
         List<MtStore> storeList = storeService.queryStoresByParams(paramsStore);
 
         // 状态列表
-        CommissionCashStatusEnum[] statusListEnum = CommissionCashStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (CommissionCashStatusEnum enumItem : statusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            statusList.add(paramDto);
-        }
+        List<ParamDto> statusList = CommissionCashStatusEnum.getCommissionCashStatusList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("dataList", paginationResponse);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionLogController.java

@@ -26,7 +26,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -138,26 +137,10 @@ public class BackendCommissionLogController extends BaseController {
         List<MtStore> storeList = storeService.queryStoresByParams(paramsStore);
 
         // 状态列表
-        CommissionStatusEnum[] statusListEnum = CommissionStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (CommissionStatusEnum enumItem : statusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            statusList.add(paramDto);
-        }
+        List<ParamDto> statusList = CommissionStatusEnum.getCommissionStatusList();
 
         // 分佣对象列表
-        CommissionTargetEnum[] targetListEnum = CommissionTargetEnum.values();
-        List<ParamDto> targetList = new ArrayList<>();
-        for (CommissionTargetEnum enumItem : targetListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            targetList.add(paramDto);
-        }
+        List<ParamDto> targetList = CommissionTargetEnum.getCommissionTargetList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("dataList", paginationResponse);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionRuleController.java

@@ -23,7 +23,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,12 +69,7 @@ public class BackendCommissionRuleController extends BaseController {
         String type = request.getParameter("type");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        Integer storeId;
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        } else {
-            storeId = accountInfo.getStoreId();
-        }
+        Integer storeId = accountInfo.getStoreId();
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -104,15 +98,7 @@ public class BackendCommissionRuleController extends BaseController {
         PaginationResponse<MtCommissionRule> paginationResponse = commissionRuleService.queryDataByPagination(paginationRequest);
 
         // 分佣提成类型列表
-        CommissionTypeEnum[] typeListEnum = CommissionTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (CommissionTypeEnum enumItem : typeListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = CommissionTypeEnum.getCommissionTypeList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("paginationResponse", paginationResponse);
@@ -136,9 +122,6 @@ public class BackendCommissionRuleController extends BaseController {
         Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         CommissionRuleDto commissionRuleDto = commissionRuleService.queryCommissionRuleById(id);
         if (commissionRuleDto == null) {
@@ -171,9 +154,7 @@ public class BackendCommissionRuleController extends BaseController {
         String id = params.getId() == null ? "" : params.getId().toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
+
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             params.setMerchantId(accountInfo.getMerchantId());
         }
@@ -198,17 +179,10 @@ public class BackendCommissionRuleController extends BaseController {
     @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('commission:rule:index')")
-    public ResponseObject info(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
+    public ResponseObject info(@PathVariable("id") Integer id) throws BusinessCheckException {
         CommissionRuleDto commissionRule = commissionRuleService.queryCommissionRuleById(id);
         Map<String, Object> result = new HashMap<>();
         result.put("commissionRule", commissionRule);
-
         return getSuccessResult(result);
     }
 }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendConfirmLogController.java

@@ -23,9 +23,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -122,15 +120,7 @@ public class BackendConfirmLogController extends BaseController {
         PaginationResponse<ConfirmLogDto> paginationResponse = confirmLogService.queryConfirmLogListByPagination(paginationRequest);
 
         // 卡券类型列表
-        CouponTypeEnum[] typeListEnum = CouponTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (CouponTypeEnum enumItem : typeListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = CouponTypeEnum.getCouponTypeList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("paginationResponse", paginationResponse);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponController.java

@@ -182,37 +182,13 @@ public class BackendCouponController extends BaseController {
         }
 
         // 卡券类型列表
-        CouponTypeEnum[] typeListEnum = CouponTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (CouponTypeEnum enumItem : typeListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = CouponTypeEnum.getCouponTypeList();
 
         // 状态列表
-        StatusEnum[] statusListEnum = StatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (StatusEnum enumItem : statusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            statusList.add(paramDto);
-        }
+        List<ParamDto> statusList = StatusEnum.getStatusList();
 
         // 卡券使用专项列表
-        CouponUseForEnum[] couponUseForEnum = CouponUseForEnum.values();
-        List<ParamDto> couponUseForList = new ArrayList<>();
-        for (CouponUseForEnum enumItem : couponUseForEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            couponUseForList.add(paramDto);
-        }
+        List<ParamDto> couponUseForList = CouponUseForEnum.getCouponUseForList();
 
         // 会员等级列表
         Map<String, Object> param = new HashMap<>();

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendDoConfirmController.java

@@ -27,7 +27,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -69,23 +68,17 @@ public class BackendDoConfirmController extends BaseController {
     /**
      * 核销详情
      *
-     * @param request  HttpServletRequest对象
+     * @param param 详情参数
      * @return
      */
     @ApiOperation(value = "核销详情")
     @RequestMapping(value = "/info", method = RequestMethod.POST)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('coupon:confirm:index')")
-    public ResponseObject info(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
+    public ResponseObject info(@RequestBody Map<String, Object> param) throws BusinessCheckException {
         String userCouponId = param.get("id") == null ? "" : param.get("id").toString();
         String userCouponCode = param.get("code") == null ? "" : param.get("code").toString();
 
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
-
         if (StringUtil.isEmpty(userCouponCode) && StringUtil.isEmpty(userCouponId)) {
             return getFailureResult(201, "核销券码不能为空");
         }
@@ -128,15 +121,7 @@ public class BackendDoConfirmController extends BaseController {
         userCouponInfo.setConfirmCount(confirmCount.intValue());
 
         // 卡券类型列表
-        CouponTypeEnum[] typeListEnum = CouponTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (CouponTypeEnum enumItem : typeListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = CouponTypeEnum.getCouponTypeList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("couponInfo", userCouponInfo);
@@ -163,9 +148,6 @@ public class BackendDoConfirmController extends BaseController {
         String remark = (param.get("remark") == null || StringUtil.isEmpty(param.get("remark").toString())) ? "后台核销" : param.get("remark").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (StringUtil.isEmpty(userCouponId)) {
             return getFailureResult(201, "系统参数有误");
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -140,15 +140,7 @@ public class BackendGoodsController extends BaseController {
         PaginationResponse<GoodsDto> paginationResponse = goodsService.queryGoodsListByPagination(paginationRequest);
 
         // 商品类型列表
-        GoodsTypeEnum[] typeListEnum = GoodsTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (GoodsTypeEnum enumItem : typeListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = GoodsTypeEnum.getGoodsTypeList();
 
         Map<String, Object> paramsStore = new HashMap<>();
         paramsStore.put("status", StatusEnum.ENABLED.getKey());
@@ -348,15 +340,7 @@ public class BackendGoodsController extends BaseController {
         List<MtStore> storeList = storeService.queryStoresByParams(paramsStore);
 
         // 商品类型列表
-        GoodsTypeEnum[] typeListEnum = GoodsTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (GoodsTypeEnum enumItem : typeListEnum) {
-             ParamDto paramDto = new ParamDto();
-             paramDto.setKey(enumItem.getKey());
-             paramDto.setName(enumItem.getValue());
-             paramDto.setValue(enumItem.getKey());
-             typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = GoodsTypeEnum.getGoodsTypeList();
 
         result.put("typeList", typeList);
         result.put("storeId", storeId);
@@ -589,7 +573,7 @@ public class BackendGoodsController extends BaseController {
     /**
      * 保存商品规格
      *
-     * @param request HttpServletRequest对象
+     * @param param 规格参数
      */
     @ApiOperation(value = "保存商品规格")
     @RequestMapping(value = "/saveSpecName", method = RequestMethod.POST)
@@ -636,7 +620,7 @@ public class BackendGoodsController extends BaseController {
     /**
      * 保存商品规格值
      *
-     * @param request HttpServletRequest对象
+     * @param param 规格值
      * @return
      */
     @ApiOperation(value = "保存商品规格值")
@@ -800,7 +784,7 @@ public class BackendGoodsController extends BaseController {
     public ResponseObject selectGoods(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        
+
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             params.put("merchantId", accountInfo.getMerchantId());
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMerchantController.java

@@ -22,7 +22,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -96,15 +95,7 @@ public class BackendMerchantController extends BaseController {
         String imagePath = settingService.getUploadBasePath();
 
         // 商户类型列表
-        MerchantTypeEnum[] typeListEnum = MerchantTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (MerchantTypeEnum enumItem : typeListEnum) {
-             ParamDto paramDto = new ParamDto();
-             paramDto.setKey(enumItem.getKey());
-             paramDto.setName(enumItem.getValue());
-             paramDto.setValue(enumItem.getKey());
-             typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = MerchantTypeEnum.getMerchantTypeList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("dataList", paginationResponse);
@@ -156,9 +147,6 @@ public class BackendMerchantController extends BaseController {
         Integer merchantId = params.get("merchantId") == null ? 0 : Integer.parseInt(params.get("merchantId").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             merchantId = accountInfo.getMerchantId();
         }
@@ -182,9 +170,6 @@ public class BackendMerchantController extends BaseController {
     public ResponseObject saveHandler(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer merchantId = StringUtil.isEmpty(params.get("id").toString()) ? Integer.parseInt("0") : Integer.parseInt(params.get("id").toString());
         String name = CommonUtil.replaceXSS(params.get("name").toString());
@@ -256,14 +241,11 @@ public class BackendMerchantController extends BaseController {
     public ResponseObject getMerchantInfo(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             id = accountInfo.getMerchantId();
         }
 
-        MtMerchant merchantInfo = merchantService.queryMerchantById(id);;
+        MtMerchant merchantInfo = merchantService.queryMerchantById(id);
 
         Map<String, Object> result = new HashMap<>();
         result.put("merchantInfo", merchantInfo);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java

@@ -101,48 +101,16 @@ public class BackendOrderController extends BaseController {
         }
         PaginationResponse response = orderService.getUserOrderList(orderListParam);
         // 订单类型列表
-        OrderTypeEnum[] typeListEnum = OrderTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (OrderTypeEnum enumItem : typeListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = OrderTypeEnum.getOrderTypeList();
 
         // 订单状态列表
-        OrderStatusEnum[] statusListEnum = OrderStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (OrderStatusEnum enumItem : statusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            statusList.add(paramDto);
-        }
+        List<ParamDto> statusList = OrderStatusEnum.getOrderStatusList();
 
         // 支付状态列表
-        PayStatusEnum[] payStatusListEnum = PayStatusEnum.values();
-        List<ParamDto> payStatusList = new ArrayList<>();
-        for (PayStatusEnum enumItem : payStatusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            payStatusList.add(paramDto);
-        }
+        List<ParamDto> payStatusList = PayStatusEnum.getPayStatusList();
 
         // 配送类型列表
-        OrderModeEnum[] orderModeEnums = OrderModeEnum.values();
-        List<ParamDto> orderModeList = new ArrayList<>();
-        for (OrderModeEnum enumItem : orderModeEnums) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            orderModeList.add(paramDto);
-        }
+        List<ParamDto> orderModeList = OrderModeEnum.getOrderModeList();
 
         // 店铺列表
         Map<String, Object> paramsStore = new HashMap<>();
@@ -156,26 +124,10 @@ public class BackendOrderController extends BaseController {
         List<MtStore> storeList = storeService.queryStoresByParams(paramsStore);
 
         // 支付方式列表
-        PayTypeEnum[] payTypes = PayTypeEnum.values();
-        List<ParamDto> payTypeList = new ArrayList<>();
-        for (PayTypeEnum typeEnum : payTypes) {
-            ParamDto payType = new ParamDto();
-            payType.setKey(typeEnum.getKey());
-            payType.setName(typeEnum.getValue());
-            payType.setValue(typeEnum.getKey());
-            payTypeList.add(payType);
-        }
+        List<ParamDto> payTypeList = PayTypeEnum.getPayTypeList();
 
         // 物流公司列表
-        ExpressCompanyEnum[] expressCompanyEnums = ExpressCompanyEnum.values();
-        List<ParamDto> expressCompanyList = new ArrayList<>();
-        for (ExpressCompanyEnum companyEnum : expressCompanyEnums) {
-            ParamDto company = new ParamDto();
-            company.setKey(companyEnum.getKey());
-            company.setName(companyEnum.getValue());
-            company.setValue(companyEnum.getValue());
-            expressCompanyList.add(company);
-        }
+        List<ParamDto> expressCompanyList = ExpressCompanyEnum.getExpressCompanyList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("typeList", typeList);
@@ -192,36 +144,21 @@ public class BackendOrderController extends BaseController {
 
     /**
      * 获取订单详情
-     * @param request HttpServletRequest对象
+     *
+     * @param orderId 订单ID
      * @return
      * */
     @ApiOperation(value = "获取订单详情")
     @RequestMapping(value = "/info/{orderId}", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('order:detail')")
-    public ResponseObject info(HttpServletRequest request, @PathVariable("orderId") Integer orderId) throws BusinessCheckException {
+    public ResponseObject info(@PathVariable("orderId") Integer orderId) throws BusinessCheckException {
         UserOrderDto orderInfo = orderService.getOrderById(orderId);
         // 支付方式列表
-        PayTypeEnum[] payTypes = PayTypeEnum.values();
-        List<ParamDto> payTypeList = new ArrayList<>();
-        for (PayTypeEnum catchTypeEnum : payTypes) {
-            ParamDto catchType = new ParamDto();
-            catchType.setKey(catchTypeEnum.getKey());
-            catchType.setName(catchTypeEnum.getValue());
-            catchType.setValue(catchTypeEnum.getKey());
-            payTypeList.add(catchType);
-        }
+        List<ParamDto> payTypeList = PayTypeEnum.getPayTypeList();
 
         // 支付状态列表
-        PayStatusEnum[] payStatusListEnum = PayStatusEnum.values();
-        List<ParamDto> payStatusList = new ArrayList<>();
-        for (PayStatusEnum enumItem : payStatusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            payStatusList.add(paramDto);
-        }
+        List<ParamDto> payStatusList = PayStatusEnum.getPayStatusList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("orderInfo", orderInfo);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendRefundController.java

@@ -23,7 +23,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,9 +81,6 @@ public class BackendRefundController extends BaseController {
         String endTime = request.getParameter("endTime") == null ? "" : request.getParameter("endTime");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer storeId = account.getStoreId() == null ? 0 : account.getStoreId();
@@ -132,26 +128,10 @@ public class BackendRefundController extends BaseController {
         PaginationResponse<RefundDto> paginationResponse = refundService.getRefundListByPagination(paginationRequest);
 
         // 售后状态列表
-        RefundStatusEnum[] statusListEnum = RefundStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (RefundStatusEnum enumItem : statusListEnum) {
-             ParamDto paramDto = new ParamDto();
-             paramDto.setKey(enumItem.getKey());
-             paramDto.setName(enumItem.getValue());
-             paramDto.setValue(enumItem.getKey());
-             statusList.add(paramDto);
-        }
+        List<ParamDto> statusList = RefundStatusEnum.getRefundStatusList();
 
         // 售后类型列表
-        RefundTypeEnum[] refundTypeEnums = RefundTypeEnum.values();
-        List<ParamDto> refundTypeList = new ArrayList<>();
-        for (RefundTypeEnum enumItem : refundTypeEnums) {
-             ParamDto paramDto = new ParamDto();
-             paramDto.setKey(enumItem.getKey());
-             paramDto.setName(enumItem.getValue());
-             paramDto.setValue(enumItem.getKey());
-             refundTypeList.add(paramDto);
-        }
+        List<ParamDto> refundTypeList = RefundTypeEnum.getRefundTypeList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("paginationResponse", paginationResponse);
@@ -173,15 +153,17 @@ public class BackendRefundController extends BaseController {
     public ResponseObject info(HttpServletRequest request, @PathVariable("refundId") Integer refundId) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         RefundDto refundInfo = refundService.getRefundById(refundId);
         UserOrderDto orderInfo = null;
         if (refundInfo != null) {
             orderInfo = orderService.getOrderById(refundInfo.getOrderId());
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(refundInfo.getMerchantId())) {
+                return getFailureResult(1004);
+            }
+        }
 
         Map<String, Object> result = new HashMap<>();
         result.put("refundInfo", refundInfo);
@@ -204,9 +186,7 @@ public class BackendRefundController extends BaseController {
         String remark = param.get("remark") == null ? "" : param.get("remark").toString();
         String rejectReason = param.get("rejectReason") == null ? "" : param.get("rejectReason").toString();
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
+
         String operator = accountInfo.getAccountName();
         if (status.equals(RefundStatusEnum.REJECT.getKey())) {
             RefundDto dto = new RefundDto();
@@ -245,9 +225,7 @@ public class BackendRefundController extends BaseController {
         String remark = param.get("remark") == null ? "" : param.get("remark").toString();
         String refundAmount = param.get("refundAmount") == null ? "" : param.get("refundAmount").toString();
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
+
         if (orderId <= 0 || StringUtil.isEmpty(refundAmount)) {
             return getFailureResult(201, "参数有误，发起退款失败");
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSettlementController.java

@@ -75,9 +75,6 @@ public class BackendSettlementController extends BaseController {
         String status = request.getParameter("status") == null ? StatusEnum.ENABLED.getKey() : request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
         Map<String, Object> searchParams = new HashMap<>();
         if (StringUtil.isNotEmpty(mobile)) {
             searchParams.put("mobile", mobile);
@@ -115,15 +112,7 @@ public class BackendSettlementController extends BaseController {
         PaginationResponse<MtSettlement> paginationResponse = settlementService.querySettlementListByPagination(paginationRequest);
 
         // 结算状态
-        SettleStatusEnum[] statusListEnum = SettleStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (SettleStatusEnum enumItem : statusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            statusList.add(paramDto);
-        }
+        List<ParamDto> statusList = SettleStatusEnum.getSettleStatusList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("merchantList", merchantList);
@@ -149,22 +138,16 @@ public class BackendSettlementController extends BaseController {
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
         Integer settlementId = request.getParameter("settlementId") == null ? 0 : Integer.parseInt(request.getParameter("settlementId"));
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         SettlementDto settlementInfo = settlementService.getSettlementInfo(settlementId, page, pageSize);
-
-        OrderStatusEnum[] statusListEnum = OrderStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (OrderStatusEnum enumItem : statusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            statusList.add(paramDto);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            if (!accountInfo.getMerchantId().equals(settlementInfo.getMerchantId())) {
+                return getFailureResult(1004);
+            }
         }
 
+        List<ParamDto> statusList = OrderStatusEnum.getOrderStatusList();
+
         Map<String, Object> result = new HashMap<>();
         result.put("settlementInfo", settlementInfo);
         result.put("statusList", statusList);
@@ -185,15 +168,14 @@ public class BackendSettlementController extends BaseController {
     public ResponseObject doSubmit(HttpServletRequest request, @RequestBody SettlementRequest requestParam) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
+
         String operator = accountInfo.getAccountName();
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             requestParam.setMerchantId(accountInfo.getMerchantId());
         }
         requestParam.setOperator(operator);
         settlementService.submitSettlement(requestParam);
+
         return getSuccessResult(true);
     }
 
@@ -211,9 +193,7 @@ public class BackendSettlementController extends BaseController {
         String token = request.getHeader("Access-Token");
         String settlementId = StringUtil.isEmpty(param.get("settlementId").toString())? "" : param.get("settlementId").toString();
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
+
         if (StringUtil.isEmpty(settlementId)) {
             return getFailureResult(201, "参数有误");
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -99,15 +99,7 @@ public class BackendStaffController extends BaseController {
         PaginationResponse<MtStaff> paginationResponse = staffService.queryStaffListByPagination(paginationRequest);
 
         // 员工类别列表
-        StaffCategoryEnum[] categoryListEnum = StaffCategoryEnum.values();
-        List<ParamDto> categoryList = new ArrayList<>();
-        for (StaffCategoryEnum enumItem : categoryListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getName());
-            paramDto.setValue(enumItem.getKey());
-            categoryList.add(paramDto);
-        }
+        List<ParamDto> categoryList = StaffCategoryEnum.getStaffCategoryList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("paginationResponse", paginationResponse);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStatisticController.java

@@ -75,9 +75,6 @@ public class BackendStatisticController extends BaseController {
         Date endTime = StringUtil.isNotEmpty(endTimeStr) ? DateUtil.parseDate(endTimeStr) : null;
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer merchantId = accountInfo.getMerchantId();
         if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
@@ -148,9 +145,6 @@ public class BackendStatisticController extends BaseController {
         Date endTime = StringUtil.isNotEmpty(endTimeStr) ? DateUtil.parseDate(endTimeStr) : null;
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer merchantId = accountInfo.getMerchantId();
         if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
@@ -178,9 +172,6 @@ public class BackendStatisticController extends BaseController {
     public ResponseObject totalMember(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         Integer merchantId = accountInfo.getMerchantId();
         Integer storeId = accountInfo.getStoreId();

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStockController.java

@@ -81,9 +81,6 @@ public class BackendStockController extends BaseController {
         String type = request.getParameter("type");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer storeId = account.getStoreId() == null ? 0 : account.getStoreId();

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStoreController.java

@@ -74,9 +74,6 @@ public class BackendStoreController extends BaseController {
         String storeStatus = request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSubMessageController.java

@@ -63,9 +63,6 @@ public class BackendSubMessageController extends BaseController {
         String title = request.getParameter("title") == null ? "" : request.getParameter("title");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         List<SubMessageDto> dataList = new ArrayList<>();
         for (WxMessageEnum wxMessageEnum : WxMessageEnum.values()) {
@@ -154,26 +151,21 @@ public class BackendSubMessageController extends BaseController {
                     JSONArray jsonArray = (JSONArray)JSONObject.parse(tplConfigJson);
                     for (int i = 0; i < jsonArray.size(); i++) {
                         JSONObject obj = jsonArray.getJSONObject(i);
-                        ParamDto dto = new ParamDto();
-                        dto.setKey(obj.get("key").toString());
                         // 解决中文乱码
                         String pName = obj.get("name").toString();
                         if (!CommonUtil.isUtf8(pName) || CommonUtil.isErrCode(pName)) {
                             pName = new String(obj.get("name").toString().getBytes("ISO8859-1"), "UTF-8");
                         }
-                        dto.setName(pName);
+                        String value = "";
                         if (paramArray != null) {
-                            dto.setValue("");
                             for (int j = 0; j < paramArray.size(); j++) {
                                  JSONObject paraObj = paramArray.getJSONObject(j);
                                  if (paraObj.get("key").toString().equals(obj.get("key").toString())) {
-                                     dto.setValue(paraObj.get("value") == null ? "" : paraObj.get("value").toString());
+                                     value = paraObj.get("value") == null ? "" : paraObj.get("value").toString();
                                  }
                             }
-                        } else {
-                            dto.setValue("");
                         }
-                        params.add(dto);
+                        params.add(new ParamDto(obj.get("key").toString(), pName, value));
                     }
                 }
 
@@ -237,16 +229,11 @@ public class BackendSubMessageController extends BaseController {
                          break;
                      }
                 }
-
-                ParamDto para = new ParamDto();
                 String name = obj.get("name").toString();
                 if (!CommonUtil.isUtf8(name) || CommonUtil.isErrCode(name)) {
                     name = new String(name.getBytes("ISO8859-1"), "UTF-8");
                 }
-                para.setName(name);
-                para.setKey(obj.get("key").toString());
-                para.setValue(value);
-                params.add(para);
+                params.add(new ParamDto(obj.get("key").toString(), name, value));
             }
 
             subMessageDto.setParams(params);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserCouponController.java

@@ -129,26 +129,10 @@ public class BackendUserCouponController extends BaseController {
         List<MtStore> storeList = storeService.queryStoresByParams(paramsStore);
 
         // 卡券类型列表
-        CouponTypeEnum[] typeListEnum = CouponTypeEnum.values();
-        List<ParamDto> typeList = new ArrayList<>();
-        for (CouponTypeEnum enumItem : typeListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            typeList.add(paramDto);
-        }
+        List<ParamDto> typeList = CouponTypeEnum.getCouponTypeList();
 
         // 卡券状态列表
-        UserCouponStatusEnum[] statusListEnum = UserCouponStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (UserCouponStatusEnum enumItem : statusListEnum) {
-            ParamDto paramDto = new ParamDto();
-            paramDto.setKey(enumItem.getKey());
-            paramDto.setName(enumItem.getValue());
-            paramDto.setValue(enumItem.getKey());
-            statusList.add(paramDto);
-        }
+        List<ParamDto> statusList = UserCouponStatusEnum.getUserCouponStatusList();
 
         Map<String, Object> data = new HashMap<>();
         data.put("paginationResponse", result.getData());

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserGradeController.java

@@ -63,9 +63,6 @@ public class BackendUserGradeController extends BaseController {
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -101,14 +98,7 @@ public class BackendUserGradeController extends BaseController {
         }
         paginationResponse.setContent(content);
 
-        List<ParamDto> catchTypes = new ArrayList<>();
-        for (UserGradeCatchTypeEnum catchTypeEnum : catchTypeList) {
-             ParamDto catchType = new ParamDto();
-             catchType.setKey(catchTypeEnum.getKey());
-             catchType.setName(catchTypeEnum.getValue());
-             catchType.setValue(catchTypeEnum.getKey());
-             catchTypes.add(catchType);
-        }
+        List<ParamDto> catchTypes = UserGradeCatchTypeEnum.getUserGradeCatchTypeList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("paginationResponse", paginationResponse);

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBookController.java

@@ -29,7 +29,6 @@ import java.lang.reflect.InvocationTargetException;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -258,17 +257,7 @@ public class ClientBookController extends BaseController {
         PaginationResponse<BookItemDto> paginationResponse = bookItemService.queryBookItemListByPagination(paginationRequest);
 
         // 预约状态列表
-        BookStatusEnum[] enums = BookStatusEnum.values();
-        List<ParamDto> statusList = new ArrayList<>();
-        for (BookStatusEnum enumItem : enums) {
-            if (!enumItem.getKey().equals(BookStatusEnum.DELETE.getKey())) {
-                ParamDto paramDto = new ParamDto();
-                paramDto.setKey(enumItem.getKey());
-                paramDto.setName(enumItem.getValue());
-                paramDto.setValue(enumItem.getKey());
-                statusList.add(paramDto);
-            }
-        }
+        List<ParamDto> statusList = BookStatusEnum.getBookStatusList();
 
         Map<String, Object> result = new HashMap<>();
         result.put("content", paginationResponse.getContent());