## 专区枚举返回不走国际化；

bd-api/bd-api-system/src/main/java/com/hzs/system/common/dto/RetailMemberDataDTO.java

@@ -32,15 +32,15 @@ public class RetailMemberDataDTO implements Serializable {
      */
     private Integer pkAwards;
 
-    /**
+//    /**
-     * 荣誉奖衔
+//     * 荣誉奖衔
-     */
+//     */
-    private Integer pkMaxAwards;
+//    private Integer pkMaxAwards;
-
+//
-    /**
+//    /**
-     * 分红奖衔
+//     * 分红奖衔
-     */
+//     */
-    private Integer pkRangeAwards;
+//    private Integer pkRangeAwards;
 
     /**
      * 国家名称

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java

@@ -348,7 +348,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         String memberSecondTable = getDayTableNameSpecial();
         //查询直推会员
         List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
-        pkMemberList.add(userId);
+//        pkMemberList.add(userId);
         CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
                 .memberRetailTable(memberRetailTable)
                 .memberRetailSTable(memberSecondTable)

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java

@@ -36,8 +36,8 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
                     .pkSettleCountry(CountryConstants.CHINA_COUNTRY)
                     .pkGrade(cuMember.getPkSettleGrade())
                     .pkAwards(cuMember.getPkAwards())
-                    .pkRangeAwards(cuMember.getPkRangeAwards())
+//                    .pkRangeAwards(cuMember.getPkRangeAwards())
-                    .pkMaxAwards(cuMember.getPkMaxAwards())
+//                    .pkMaxAwards(cuMember.getPkMaxAwards())
                     .build()).getData();
 
             // 会员标记（0=正常会员）
@@ -68,10 +68,10 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
                     .gradeIcon(memberDataDTO.getGradeIcon())
                     .pkAwardsVal(memberDataDTO.getAwardsVal())
                     .awardsIcon(memberDataDTO.getAwardsIcon())
-                    .pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal())
+//                    .pkMaxAwardsVal(memberDataDTO.getMaxAwardsVal())
-                    .maxAwardsIcon(memberDataDTO.getMaxAwardsIcon())
+//                    .maxAwardsIcon(memberDataDTO.getMaxAwardsIcon())
-                    .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
+//                    .pkRangeAwardsVal(memberDataDTO.getRangeAwardsVal())
-                    .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
+//                    .rangeAwardsIcon(memberDataDTO.getRangeAwardsIcon())
                     .currencyIcon(memberDataDTO.getCurrencyIcon())
                     .memberSign(memberSign)
                     .control(control)

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java

@@ -36,20 +36,23 @@ public class DataStatisticsUtil {
         Long pkId = cuMember.getPkId();
         // 非激活直接返0
         // 激活判断上一天的ENABLE_STATUS 0为正常 1为当天激活 不计算日结数据
-        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
+//        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
-            return CuMemberRetailDataStatisticsResultVO.builder()
+//            return CuMemberRetailDataStatisticsResultVO.builder()
-                    .totalPv(BigDecimal.ZERO)
+//                    .totalPv(BigDecimal.ZERO)
-                    .bigRangeTotalPv(BigDecimal.ZERO)
+//                    .bigRangeTotalPv(BigDecimal.ZERO)
-                    .smallRangeTotalPv(BigDecimal.ZERO)
+//                    .smallRangeTotalPv(BigDecimal.ZERO)
-                    .build();
+//                    .build();
-        }
+//        }
         calcDetailVOTotalField(detailVOList, pkId);
 //        addVirtualBranch(detailVOList, pkId);
-        CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
+//        CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
-        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
+        CuMemberRetailDataStatisticsDetailVO total = CuMemberRetailDataStatisticsDetailVO.builder()
-            // 昨日非激活 排除昨日日结表数据
+                    .totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getTotalPv).reduce(BigDecimal.ZERO, BigDecimal::add))
-            excludeDailySettlementData(detailVOList);
+                    .build();
-        }
+//        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
+//            // 昨日非激活 排除昨日日结表数据
+//            excludeDailySettlementData(detailVOList);
+//        }
         CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
         BigDecimal smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv());
         if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) {
@@ -69,17 +72,17 @@ public class DataStatisticsUtil {
      */
     public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId) {
         detailVOList.forEach(detailVO -> {
-//            detailVO.setTotalPv(
-//                    detailVO.getConsumePv()
-//                            .add(detailVO.getTeamConsumePv())
-//                            .add(detailVO.getSNewConsumePv())
-//                            .add(detailVO.getSTeamNewPv())
-//            );
             detailVO.setTotalPv(
-                    detailVO.getTeamConsumePv()
+                    detailVO.getConsumePv()
+                            .add(detailVO.getTeamConsumePv())
                             .add(detailVO.getSNewConsumePv())
                             .add(detailVO.getSTeamNewPv())
             );
+//            detailVO.setTotalPv(
+//                    detailVO.getTeamConsumePv()
+//                            .add(detailVO.getSNewConsumePv())
+//                            .add(detailVO.getSTeamNewPv())
+//            );
         });
     }
 

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java

@@ -84,23 +84,23 @@ public class RetailMemberInfoVO implements Serializable {
      */
     private String awardsIcon;
 
-    /**
+//    /**
-     * 荣誉奖衔名称
+//     * 荣誉奖衔名称
-     */
+//     */
-    private String pkMaxAwardsVal;
+//    private String pkMaxAwardsVal;
-    /**
+//    /**
-     * 荣誉奖衔图标
+//     * 荣誉奖衔图标
-     */
+//     */
-    private String maxAwardsIcon;
+//    private String maxAwardsIcon;
 
-    /**
+//    /**
-     * 分红奖衔名称
+//     * 分红奖衔名称
-     */
+//     */
-    private String pkRangeAwardsVal;
+//    private String pkRangeAwardsVal;
-    /**
+//    /**
-     * 分红奖衔图标
+//     * 分红奖衔图标
-     */
+//     */
-    private String rangeAwardsIcon;
+//    private String rangeAwardsIcon;
 
     /**
      * 币种图标

bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml

@@ -447,6 +447,31 @@
 
     <select id="getRetailDataStatisticsDetail"
             resultType="com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO">
+        SELECT
+        cu.pk_id,
+        cu.MEMBER_CODE,
+        mr.ENABLE_STATUS,
+
+        NVL( mr.CONSUME_PV, 0 ) consumePv,
+        0 newConsumePv,
+
+        NVL( mr.TEAM_CONSUME_PV, 0 ) teamConsumePv,
+        0 teamNewPv,
+
+        0 sNewConsumePv,
+        0 sTeamNewPv
+        FROM ${memberRetailTable} mr
+        left join cu_member cu on cu.PK_ID = mr.PK_MEMBER and mr.CATEGORY = 0
+        <where>
+            <if test="pkMemberList != null and pkMemberList.size > 0">
+                cu.pk_id in
+                <foreach collection="pkMemberList" item="pkMember" separator="," open="(" close=")">
+                    #{pkMember}
+                </foreach>
+            </if>
+        </where>
+
+<!-- 市场动态不需要显示自己，不需要显示秒结
         SELECT
             cu.pk_id,
             cu.MEMBER_CODE,
@@ -472,6 +497,7 @@
                 </foreach>
             </if>
         </where>
+        -->
     </select>
 
     <select id="getMarketDynamicsDetail" resultType="com.hzs.retail.member.vo.MarketDynamicsDetailVO">

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java

@@ -94,6 +94,18 @@ public class SaDeliverController extends BaseController {
             for (DeliverVO deliver : resultList) {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliver);
+                // 订单类型枚举转换
+                deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType()));
+                // 发货类型
+                deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel()));
+                // 发货方式
+                deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay()));
+                // 供应方式
+                deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope()));
+                // 运输方式
+                deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType()));
+                // 发货状态
+                deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel());
             }
         }
         return getDataTable(resultList);
@@ -142,12 +154,12 @@ public class SaDeliverController extends BaseController {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliver);
 
-                deliver.setDeliverStatusVal(transactionMap.get(EnumsPrefixConstants.DELIVERY_STATUS + deliver.getDeliverStatus()));
+                deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel());
-                deliver.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliver.getDeliveryWay()));
+                deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay()));
-                deliver.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliver.getOperateScope()));
+                deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope()));
-                deliver.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliver.getOrderType()));
+                deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType()));
-                deliver.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliver.getTranType()));
+                deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType()));
-                deliver.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliver.getShippingChannel()));
+                deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel()));
             }
         }
         ExcelUtil<DeliverVO> util = new ExcelUtil<>(DeliverVO.class);

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java

@@ -98,6 +98,22 @@ public class SaDeliverHandledController extends BaseController {
             for (DeliverHandledVO deliverHandled : resultList) {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliverHandled);
+                // 订单类型枚举转换
+                deliverHandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverHandled.getOrderType()));
+                // 发货类型
+                deliverHandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverHandled.getShippingChannel()));
+                // 订单状态
+                deliverHandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverHandled.getOrderStatus()));
+                // 发货方式
+                deliverHandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverHandled.getDeliveryWay()));
+                // 供应方式
+                deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope()));
+                // 运输方式
+                deliverHandled.setTranTypeVal(ETransportType.getLabelByValue(deliverHandled.getTranType()));
+                // 预售状态
+                deliverHandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverHandled.getPreSaleStatus()));
+                // 打印状态
+                deliverHandled.setPrintStatusVal(EPrintStatus.getEnumByValue(deliverHandled.getPrintStatus()).getLabel());
             }
         }
         return getDataTable(resultList);
@@ -140,15 +156,22 @@ public class SaDeliverHandledController extends BaseController {
             for (DeliverHandledVO deliverHandled : resultList) {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliverHandled);
-
+                // 订单类型枚举转换
-                deliverHandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverHandled.getOrderStatus()));
+                deliverHandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverHandled.getOrderType()));
-                deliverHandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverHandled.getOrderType()));
+                // 发货类型
-                deliverHandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverHandled.getDeliveryWay()));
+                deliverHandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverHandled.getShippingChannel()));
-                deliverHandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverHandled.getOperateScope()));
+                // 订单状态
-                deliverHandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverHandled.getPreSaleStatus()));
+                deliverHandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverHandled.getOrderStatus()));
-                deliverHandled.setPrintStatusVal(transactionMap.get(EnumsPrefixConstants.E_PRINT_STATUS + deliverHandled.getPrintStatus()));
+                // 发货方式
-                deliverHandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverHandled.getTranType()));
+                deliverHandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverHandled.getDeliveryWay()));
-                deliverHandled.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliverHandled.getShippingChannel()));
+                // 供应方式
+                deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope()));
+                // 运输方式
+                deliverHandled.setTranTypeVal(ETransportType.getLabelByValue(deliverHandled.getTranType()));
+                // 预售状态
+                deliverHandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverHandled.getPreSaleStatus()));
+                // 打印状态
+                deliverHandled.setPrintStatusVal(EPrintStatus.getEnumByValue(deliverHandled.getPrintStatus()).getLabel());
 
                 deliverHandled.setRecProvinceVal(deliverHandled.getRecProvinceVal());
                 deliverHandled.setRecCityVal(StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : "");

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java

@@ -58,7 +58,6 @@ public class DeliverHandledVO {
      * 订单类型（EOrderType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE)
     private Integer orderType;
     /**
      * 订单类型显示
@@ -69,7 +68,6 @@ public class DeliverHandledVO {
     /**
      * 订单状态（EOrderStatus）
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS)
     private Integer orderStatus;
     /**
      * 订单状态显示
@@ -177,7 +175,6 @@ public class DeliverHandledVO {
     /**
      * 发货类型
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL)
     @JsonIgnore
     private Integer shippingChannel;
     /**
@@ -196,7 +193,6 @@ public class DeliverHandledVO {
      * 打印状态（EPrintStatus）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.E_PRINT_STATUS)
     private Integer printStatus;
     /**
      * 打印状态显示
@@ -215,7 +211,6 @@ public class DeliverHandledVO {
      * 发货方式（EDelivery）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY)
     private Integer deliveryWay;
     /**
      * 发货方式显示
@@ -228,7 +223,6 @@ public class DeliverHandledVO {
      * 供应方式（ESupplyWay）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY)
     private Integer operateScope;
     /**
      * 供应方式显示
@@ -240,7 +234,6 @@ public class DeliverHandledVO {
      * 运输方式（ETransportType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ENU_TRA)
     private Integer tranType;
     /**
      * 运输方式显示
@@ -252,7 +245,6 @@ public class DeliverHandledVO {
      * 预售状态（EPresaleStatus）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.PRESALE_STATUS)
     private Integer preSaleStatus;
     /**
      * 预售状态显示

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java

@@ -41,7 +41,6 @@ public class DeliverVO {
      * 订单类型（EOrderType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE)
     private Integer orderType;
     /**
      * 订单类型显示
@@ -54,7 +53,6 @@ public class DeliverVO {
      * 发货单状态（EDeliveryStatus）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY_STATUS)
     private Integer deliverStatus;
     /**
      * 发货单状态显示
@@ -165,7 +163,6 @@ public class DeliverVO {
     /**
      * 发货类型
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL)
     private Integer shippingChannel;
     /**
      * 发货类型
@@ -195,7 +192,6 @@ public class DeliverVO {
      * 发货方式（EDelivery）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY)
     private Integer deliveryWay;
     /**
      * 发货方式显示
@@ -207,7 +203,6 @@ public class DeliverVO {
      * 供应方式（ESupplyWay）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY)
     private Integer operateScope;
     /**
      * 供应方式显示
@@ -219,7 +214,6 @@ public class DeliverVO {
      * 运输方式（ETransportType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ENU_TRA)
     private Integer tranType;
     /**
      * 运输方式显示

bd-business/bd-business-system/src/main/java/com/hzs/system/common/provider/CommonServiceProvider.java

@@ -143,31 +143,31 @@ public class CommonServiceProvider implements ICommonServiceApi {
                 }
             }
         }
-        // 荣誉奖衔
+//        // 荣誉奖衔
-        if (null != memberDataDTO.getPkMaxAwards()) {
+//        if (null != memberDataDTO.getPkMaxAwards()) {
-            BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkMaxAwards());
+//            BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkMaxAwards());
-            if (null != bdAwards) {
+//            if (null != bdAwards) {
-                if (null != monthAwards && monthAwards.getAwardsValue() > bdAwards.getAwardsValue()) {
+//                if (null != monthAwards && monthAwards.getAwardsValue() > bdAwards.getAwardsValue()) {
-                    // 月奖衔 大于 荣誉奖衔，显示月奖衔
+//                    // 月奖衔 大于 荣誉奖衔，显示月奖衔
-                    memberDataDTO.setMaxAwardsVal(memberDataDTO.getAwardsVal());
+//                    memberDataDTO.setMaxAwardsVal(memberDataDTO.getAwardsVal());
-                    memberDataDTO.setMaxAwardsIcon(memberDataDTO.getAwardsIcon());
+//                    memberDataDTO.setMaxAwardsIcon(memberDataDTO.getAwardsIcon());
-                } else {
+//                } else {
-                    memberDataDTO.setMaxAwardsVal(bdAwards.getAwardsName());
+//                    memberDataDTO.setMaxAwardsVal(bdAwards.getAwardsName());
-                    memberDataDTO.setMaxAwardsIcon(bdAwards.getImage());
+//                    memberDataDTO.setMaxAwardsIcon(bdAwards.getImage());
-                }
+//                }
-            }
+//            }
-        }
+//        }
-        // 分红奖衔
+//        // 分红奖衔
-        if (null != memberDataDTO.getPkRangeAwards()) {
+//        if (null != memberDataDTO.getPkRangeAwards()) {
-            BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkRangeAwards());
+//            BdAwards bdAwards = iBdAwardsService.getBdAwardsOne(memberDataDTO.getPkRangeAwards());
-            if (null != bdAwards) {
+//            if (null != bdAwards) {
-                if (bdAwards.getAwardsValue() > EAwards.HIGH_MANAGER.getValue()) {
+//                if (bdAwards.getAwardsValue() > EAwards.HIGH_MANAGER.getValue()) {
-                    // 前4级不显示分红奖衔
+//                    // 前4级不显示分红奖衔
-                    memberDataDTO.setRangeAwardsVal(bdAwards.getAwardsName());
+//                    memberDataDTO.setRangeAwardsVal(bdAwards.getAwardsName());
-                    memberDataDTO.setRangeAwardsIcon(bdAwards.getImage());
+//                    memberDataDTO.setRangeAwardsIcon(bdAwards.getImage());
-                }
+//                }
-            }
+//            }
-        }
+//        }
         // 币种
         if (null != memberDataDTO.getPkSettleCountry()) {
             BdCurrency bdCurrency = iBdCurrencyService.getCurrency(memberDataDTO.getPkSettleCountry());

bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAreaCurrencyController.java

@@ -2,7 +2,7 @@ package com.hzs.system.config.controller.manage;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.hzs.common.core.annotation.Log;
 import com.hzs.common.core.constant.CacheConstants;
 import com.hzs.common.core.constant.msg.ConfigMsgConstants;
@@ -37,9 +37,6 @@ import java.util.stream.Collectors;
 
 /**
  * 消费配置表 前端控制器
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 @Slf4j
 @RestController
@@ -47,39 +44,37 @@ import java.util.stream.Collectors;
 public class BdAreaCurrencyController extends ConfigBaseController {
 
     @Autowired
-    private IBdAreaCurrencyService areaCurrencyParamService;
+    private IBdAreaCurrencyService iBdAreaCurrencyService;
     @Autowired
-    private IBdAreaCurrencyDetailService areaCurrencyDetailService;
+    private IBdAreaCurrencyDetailService iBdAreaCurrencyDetailService;
     @Autowired
     private IBdAccountService iBdAccountService;
     @Autowired
     private RedisService redisService;
 
     /**
-     * @description: 查询消费配置列表
+     * 查询消费配置列表
-     * @author: zhang jing
-     * @date: 2022/8/29 9:59
-     * @param: [areaCurrencyParam]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CONSUME_CONFIG, method = EOperationMethod.SELECT)
     @GetMapping("/list")
     public TableDataInfo list(BdAreaCurrencyExt areaCurrencyExt) {
         startPage();
-        QueryWrapper<BdAreaCurrency> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<BdAreaCurrency> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry());
+        queryWrapper.eq(BdAreaCurrency::getPkCountry, SecurityUtils.getPkCountry());
         if (StringUtils.isNotNull(areaCurrencyExt.getSpecialArea())) {
-            queryWrapper.eq("SPECIAL_AREA", areaCurrencyExt.getSpecialArea());
+            queryWrapper.eq(BdAreaCurrency::getSpecialArea, areaCurrencyExt.getSpecialArea());
         }
-        queryWrapper.orderByAsc("SPECIAL_AREA");
+        queryWrapper.orderByAsc(BdAreaCurrency::getSpecialArea);
-        queryWrapper.orderByDesc("EFFECTIVE_DATE");
+        queryWrapper.orderByDesc(BdAreaCurrency::getEffectiveDate);
-        List<BdAreaCurrency> list = areaCurrencyParamService.list(queryWrapper);
+        List<BdAreaCurrency> list = iBdAreaCurrencyService.list(queryWrapper);
         List<BdAreaCurrencyExt> listExt = new ArrayList<>();
         for (BdAreaCurrency bac : list) {
             BdAreaCurrencyExt bacExt = BeanUtil.copyProperties(bac, BdAreaCurrencyExt.class);
+            bacExt.setSpecialAreaVal(ESpecialArea.getLabelByValue(bacExt.getSpecialArea()));
+
             BdAreaCurrencyDetailExt areaCurrencyDetailExt = new BdAreaCurrencyDetailExt();
             areaCurrencyDetailExt.setPkAreaCurrency(bac.getPkId().intValue());
-            List<BdAreaCurrencyDetailExt> detailsList = areaCurrencyDetailService.getAreaCurrencyDetailList(areaCurrencyDetailExt);
+            List<BdAreaCurrencyDetailExt> detailsList = iBdAreaCurrencyDetailService.getAreaCurrencyDetailList(areaCurrencyDetailExt);
             bacExt.setDetailsList(detailsList);
             listExt.add(bacExt);
         }
@@ -87,29 +82,25 @@ public class BdAreaCurrencyController extends ConfigBaseController {
     }
 
     /**
-     * @description: 导出
+     * 导出
-     * @author: zhang jing
-     * @date: 2023/3/3 15:47
-     * @param: [response, areaCurrencyExt]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CONSUME_CONFIG, method = EOperationMethod.SELECT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BdAreaCurrencyExt areaCurrencyExt) {
-        QueryWrapper<BdAreaCurrency> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<BdAreaCurrency> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry());
+        queryWrapper.eq(BdAreaCurrency::getPkCountry, SecurityUtils.getPkCountry());
         if (StringUtils.isNotNull(areaCurrencyExt.getSpecialArea())) {
-            queryWrapper.eq("SPECIAL_AREA", areaCurrencyExt.getSpecialArea());
+            queryWrapper.eq(BdAreaCurrency::getSpecialArea, areaCurrencyExt.getSpecialArea());
         }
-        queryWrapper.orderByAsc("EFFECTIVE_DATE");
+        queryWrapper.orderByAsc(BdAreaCurrency::getEffectiveDate);
-        List<BdAreaCurrency> list = areaCurrencyParamService.list(queryWrapper);
+        List<BdAreaCurrency> list = iBdAreaCurrencyService.list(queryWrapper);
         List<BdAreaCurrencyExt> listExt = new ArrayList<>();
         String deductSortName = "";
         for (BdAreaCurrency bac : list) {
             BdAreaCurrencyExt bacExt = BeanUtil.copyProperties(bac, BdAreaCurrencyExt.class);
             BdAreaCurrencyDetailExt areaCurrencyDetailExt = new BdAreaCurrencyDetailExt();
             areaCurrencyDetailExt.setPkAreaCurrency(bac.getPkId().intValue());
-            List<BdAreaCurrencyDetailExt> detailsList = areaCurrencyDetailService.getAreaCurrencyDetailList(areaCurrencyDetailExt);
+            List<BdAreaCurrencyDetailExt> detailsList = iBdAreaCurrencyDetailService.getAreaCurrencyDetailList(areaCurrencyDetailExt);
             if (CollectionUtil.isNotEmpty(detailsList)) {
                 for (BdAreaCurrencyDetailExt acd : detailsList) {
                     deductSortName = acd.getAccountName() + "/" + acd.getDeductRatio() + " " + deductSortName;
@@ -124,11 +115,7 @@ public class BdAreaCurrencyController extends ConfigBaseController {
     }
 
     /**
-     * @description: 新增消费配置
+     * 新增消费配置
-     * @author: zhang jing
-     * @date: 2022/8/29 9:59
-     * @param: [areaCurrencyParam]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CONSUME_CONFIG, method = EOperationMethod.INSERT)
     @PostMapping("/save")
@@ -180,16 +167,12 @@ public class BdAreaCurrencyController extends ConfigBaseController {
         areaCurrencyExt.setCreationTime(new Date());
         String key = CacheConstants.BD_AREA_CURRENCY + areaCurrencyExt.getPkCountry().toString() + areaCurrencyExt.getSpecialArea();
         sendDelayedMessage(areaCurrencyExt, EDelayBusType.CURRENCY.getValue(), key);
-        return toAjax(areaCurrencyParamService.saveAreaCurrency(areaCurrencyExt));
+        return toAjax(iBdAreaCurrencyService.saveAreaCurrency(areaCurrencyExt));
     }
 
 
     /**
-     * @description: 修改消费配置
+     * 修改消费配置
-     * @author: zhang jing
-     * @date: 2022/8/29 9:59
-     * @param: [areaCurrencyParam]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CONSUME_CONFIG, method = EOperationMethod.UPDATE)
     @PostMapping("/update")
@@ -251,45 +234,35 @@ public class BdAreaCurrencyController extends ConfigBaseController {
                 redisService.deleteObject(key);
             }
         }
-        return toAjax(areaCurrencyParamService.updateAreaCurrency(areaCurrencyExt));
+        return toAjax(iBdAreaCurrencyService.updateAreaCurrency(areaCurrencyExt));
     }
 
 
     /**
-     * @description: 获取单条消费配置
+     * 获取单条消费配置
-     * @author: zhang jing
-     * @date: 2022/8/29 9:59
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CONSUME_CONFIG, method = EOperationMethod.SELECT)
     @GetMapping("/getOne/{pkId}")
     public AjaxResult getOne(@PathVariable Long pkId) {
-        BdAreaCurrency areaCurrencyParam = areaCurrencyParamService.getById(pkId);
+        BdAreaCurrency areaCurrencyParam = iBdAreaCurrencyService.getById(pkId);
         BdAreaCurrencyExt areaCurrencyExt = BeanUtil.copyProperties(areaCurrencyParam, BdAreaCurrencyExt.class);
         BdAreaCurrencyDetailExt areaCurrencyDetailExt = new BdAreaCurrencyDetailExt();
         areaCurrencyDetailExt.setPkAreaCurrency(pkId.intValue());
-        areaCurrencyExt.setDetailsList(areaCurrencyDetailService.getAreaCurrencyDetailList(areaCurrencyDetailExt));
+        areaCurrencyExt.setDetailsList(iBdAreaCurrencyDetailService.getAreaCurrencyDetailList(areaCurrencyDetailExt));
         return AjaxResult.success(areaCurrencyExt);
     }
 
     /**
-     * @description: 删除消费配置
+     * 删除消费配置
-     * @author: zhang jing
-     * @date: 2022/8/29 9:59
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CONSUME_CONFIG, method = EOperationMethod.DELETE)
     @DeleteMapping("/{pkId}")
     public AjaxResult delete(@PathVariable Long pkId) {
-        Long pkModified = SecurityUtils.getUserId();
-        Date date = new Date();
         BdAreaCurrency areaCurrency = new BdAreaCurrency();
-        areaCurrency.setPkModified(pkModified);
+        areaCurrency.setPkModified(SecurityUtils.getUserId());
-        areaCurrency.setModifiedTime(date);
+        areaCurrency.setModifiedTime(new Date());
         areaCurrency.setPkId(pkId);
-        return toAjax(areaCurrencyParamService.delAreaCurrency(areaCurrency));
+        return toAjax(iBdAreaCurrencyService.delAreaCurrency(areaCurrency));
     }
 
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAreaCurrencyDetailMapper.java

@@ -8,9 +8,6 @@ import java.util.List;
 
 /**
  * 消费配置详情表 Mapper 接口
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 public interface BdAreaCurrencyDetailMapper extends BaseMapper<BdAreaCurrencyDetail> {
 
@@ -31,11 +28,7 @@ public interface BdAreaCurrencyDetailMapper extends BaseMapper<BdAreaCurrencyDet
     BdAreaCurrencyDetail checkDeductSort(BdAreaCurrencyDetail areaCurrencyDetail);
 
     /**
-     * @description: 获取消费配置详情列表
+     * 获取消费配置详情列表
-     * @author: zhang jing
-     * @date: 2022/8/30 17:49
-     * @param: [areaCurrencyDetailVo]
-     * @return: java.util.List<com.hzs.common.domain.system.config.vo.BdAreaCurrencyDetailVo>
      **/
     List<BdAreaCurrencyDetailExt> getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt);
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAreaCurrencyMapper.java

@@ -1,17 +1,10 @@
 package com.hzs.system.config.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.system.config.BdAreaCurrency;
 
-
 /**
- * <p>
  * 消费配置表 Mapper 接口
- * </p>
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 public interface BdAreaCurrencyMapper extends BaseMapper<BdAreaCurrency> {
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyDetailService.java

@@ -8,9 +8,6 @@ import java.util.List;
 
 /**
  * 消费配置详情表 服务类
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 public interface IBdAreaCurrencyDetailService extends IService<BdAreaCurrencyDetail> {
 
@@ -31,11 +28,7 @@ public interface IBdAreaCurrencyDetailService extends IService<BdAreaCurrencyDet
     BdAreaCurrencyDetail checkDeductSort(BdAreaCurrencyDetail areaCurrencyDetail);
 
     /**
-     * @description: 获取消费配置详情列表
+     * 获取消费配置详情列表
-     * @author: zhang jing
-     * @date: 2022/8/30 17:51
-     * @param: [areaCurrencyDetailVo]
-     * @return: java.util.List<com.hzs.common.domain.system.config.vo.BdAreaCurrencyDetailVo>
      **/
     List<BdAreaCurrencyDetailExt> getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt);
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAreaCurrencyService.java

@@ -6,27 +6,16 @@ import com.hzs.common.domain.system.config.ext.BdAreaCurrencyExt;
 
 /**
  * 消费配置表 服务类
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 public interface IBdAreaCurrencyService extends IService<BdAreaCurrency> {
 
     /**
-     * @description: 新增消费配置+新增消费配置详情
+     * 新增消费配置+新增消费配置详情
-     * @author: zhang jing
-     * @date: 2022/10/26 17:48
-     * @param: [areaCurrencyExt]
-     * @return: boolean
      **/
     boolean saveAreaCurrency(BdAreaCurrencyExt areaCurrencyExt);
 
     /**
-     * @description: 修改消费配置+修改消费配置详情
+     * 修改消费配置+修改消费配置详情
-     * @author: zhang jing
-     * @date: 2022/10/26 17:48
-     * @param: [areaCurrencyExt]
-     * @return: boolean
      **/
     boolean updateAreaCurrency(BdAreaCurrencyExt areaCurrencyExt);
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyDetailServiceImpl.java

@@ -11,42 +11,20 @@ import java.util.List;
 
 /**
  * 消费配置详情表 服务实现类
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 @Service
 public class BdAreaCurrencyDetailServiceImpl extends ServiceImpl<BdAreaCurrencyDetailMapper, BdAreaCurrencyDetail> implements IBdAreaCurrencyDetailService {
 
-    /**
-     * 获取可使用最扣除大比例
-     *
-     * @param areaCurrencyDetail
-     * @return
-     */
     @Override
     public BdAreaCurrencyDetail getSumDeductRatio(BdAreaCurrencyDetail areaCurrencyDetail) {
         return baseMapper.getSumDeductRatio(areaCurrencyDetail);
     }
 
-    /**
-     * 校验扣款顺序是否唯一
-     *
-     * @param areaCurrencyDetail
-     * @return
-     */
     @Override
     public BdAreaCurrencyDetail checkDeductSort(BdAreaCurrencyDetail areaCurrencyDetail) {
         return baseMapper.checkDeductSort(areaCurrencyDetail);
     }
 
-    /**
-     * @description: 获取消费配置详情列表
-     * @author: zhang jing
-     * @date: 2022/8/30 17:51
-     * @param: [areaCurrencyDetailVo]
-     * @return: java.util.List<com.hzs.common.domain.system.config.vo.BdAreaCurrencyDetailVo>
-     **/
     @Override
     public List<BdAreaCurrencyDetailExt> getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt) {
         return baseMapper.getAreaCurrencyDetailList(areaCurrencyDetailExt);

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAreaCurrencyServiceImpl.java

@@ -1,7 +1,7 @@
 package com.hzs.system.config.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.constant.CacheConstants;
 import com.hzs.common.core.enums.EDelFlag;
@@ -24,27 +24,15 @@ import java.util.List;
 
 /**
  * 消费配置表 服务实现类
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 @Service
 public class BdAreaCurrencyServiceImpl extends ServiceImpl<BdAreaCurrencyMapper, BdAreaCurrency> implements IBdAreaCurrencyService {
 
     @Autowired
-    IBdAreaCurrencyDetailService areaCurrencyDetailService;
+    private IBdAreaCurrencyDetailService iBdAreaCurrencyDetailService;
-    @Autowired
-    private IBdAreaCurrencyDetailService areaCurrencyParamDetailService;
     @Autowired
     private RedisService redisService;
 
-    /**
-     * @description: 新增消费配置+新增消费配置详情
-     * @author: zhang jing
-     * @date: 2022/10/26 17:27
-     * @param: [areaCurrencyExt]
-     * @return: boolean
-     **/
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean saveAreaCurrency(BdAreaCurrencyExt areaCurrencyExt) {
@@ -60,30 +48,23 @@ public class BdAreaCurrencyServiceImpl extends ServiceImpl<BdAreaCurrencyMapper,
                 bcd.setPkCountry(SecurityUtils.getPkCountry());
                 bcd.setPkCreator(SecurityUtils.getUserId());
                 bcd.setCreationTime(new Date());
-                areaCurrencyDetailService.save(bcd);
+                iBdAreaCurrencyDetailService.save(bcd);
             }
         }
         return true;
     }
 
-    /**
-     * @description: 修改消费配置+修改消费配置详情
-     * @author: zhang jing
-     * @date: 2022/10/26 17:27
-     * @param: [areaCurrencyExt]
-     * @return: boolean
-     **/
     @Override
     public boolean updateAreaCurrency(BdAreaCurrencyExt areaCurrencyExt) {
         List<BdAreaCurrencyDetailExt> detailsList = areaCurrencyExt.getDetailsList();
         baseMapper.updateById(areaCurrencyExt);
         BdAreaCurrencyDetail areaCurrencyDetail = new BdAreaCurrencyDetail();
         areaCurrencyDetail.setPkAreaCurrency(areaCurrencyExt.getPkId().intValue());
-        UpdateWrapper<BdAreaCurrencyDetail> updateWrapper = new UpdateWrapper<>();
+        LambdaUpdateWrapper<BdAreaCurrencyDetail> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set("DEL_FLAG", EYesNo.NO.getIntValue());
+        updateWrapper.set(BdAreaCurrencyDetail::getDelFlag, EYesNo.NO.getIntValue());
-        updateWrapper.eq("PK_AREA_CURRENCY", areaCurrencyExt.getPkId());
+        updateWrapper.eq(BdAreaCurrencyDetail::getPkAreaCurrency, areaCurrencyExt.getPkId());
-        updateWrapper.eq("DEL_FLAG", EYesNo.YES.getIntValue());
+        updateWrapper.eq(BdAreaCurrencyDetail::getDelFlag, EYesNo.YES.getIntValue());
-        areaCurrencyDetailService.update(updateWrapper);
+        iBdAreaCurrencyDetailService.update(updateWrapper);
         if (CollectionUtil.isNotEmpty(detailsList)) {
             for (BdAreaCurrencyDetailExt bcd : detailsList) {
                 bcd.setPkAreaCurrency(areaCurrencyExt.getPkId().intValue());
@@ -95,36 +76,29 @@ public class BdAreaCurrencyServiceImpl extends ServiceImpl<BdAreaCurrencyMapper,
                 bcd.setModifiedTime(new Date());
                 bcd.setDeductSort(bcd.getDeductSort());
                 bcd.setDeductMaxRatio(bcd.getDeductMaxRatio());
-                areaCurrencyDetailService.save(bcd);
+                iBdAreaCurrencyDetailService.save(bcd);
             }
         }
         return true;
     }
 
-    /**
-     * @description: 删除
-     * @author: zhang jing
-     * @date: 2023/5/6 12:02
-     * @param: [bdAreaCurrency]
-     * @return: boolean
-     **/
-    @Override
     @Transactional(rollbackFor = Exception.class)
+    @Override
     public boolean delAreaCurrency(BdAreaCurrency bdAreaCurrency) {
         BdAreaCurrency areaCurrencyParam = baseMapper.selectById(bdAreaCurrency.getPkId());
-        UpdateWrapper<BdAreaCurrencyDetail> updateWrapper = new UpdateWrapper<>();
+        LambdaUpdateWrapper<BdAreaCurrencyDetail> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq("PK_AREA_CURRENCY", bdAreaCurrency.getPkId());
+        updateWrapper.eq(BdAreaCurrencyDetail::getPkAreaCurrency, bdAreaCurrency.getPkId());
-        updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
+        updateWrapper.set(BdAreaCurrencyDetail::getDelFlag, EDelFlag.DELETE.getValue());
-        updateWrapper.set("PK_MODIFIED", bdAreaCurrency.getPkModified());
+        updateWrapper.set(BdAreaCurrencyDetail::getPkModified, bdAreaCurrency.getPkModified());
-        updateWrapper.set("MODIFIED_TIME", bdAreaCurrency.getModifiedTime());
+        updateWrapper.set(BdAreaCurrencyDetail::getModifiedTime, bdAreaCurrency.getModifiedTime());
 
-        areaCurrencyParamDetailService.update(updateWrapper);
+        iBdAreaCurrencyDetailService.update(updateWrapper);
         bdAreaCurrency.setDelFlag(EDelFlag.DELETE.getValue());
-        UpdateWrapper<BdAreaCurrency> updateWrapper1 = new UpdateWrapper<>();
+        LambdaUpdateWrapper<BdAreaCurrency> updateWrapper1 = new LambdaUpdateWrapper<>();
-        updateWrapper1.eq("PK_ID", bdAreaCurrency.getPkId());
+        updateWrapper1.eq(BdAreaCurrency::getPkId, bdAreaCurrency.getPkId());
-        updateWrapper1.set("DEL_FLAG", EDelFlag.DELETE.getValue());
+        updateWrapper1.set(BdAreaCurrency::getDelFlag, EDelFlag.DELETE.getValue());
-        updateWrapper1.set("PK_MODIFIED", bdAreaCurrency.getPkModified());
+        updateWrapper1.set(BdAreaCurrency::getPkModified, bdAreaCurrency.getPkModified());
-        updateWrapper1.set("MODIFIED_TIME", bdAreaCurrency.getModifiedTime());
+        updateWrapper1.set(BdAreaCurrency::getModifiedTime, bdAreaCurrency.getModifiedTime());
         baseMapper.update(null, updateWrapper1);
         String key = CacheConstants.BD_AREA_CURRENCY + areaCurrencyParam.getPkCountry().toString() + areaCurrencyParam.getSpecialArea();
         if (redisService.hasKey(key)) {

bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java

@@ -464,7 +464,7 @@ public class EnumsController extends BaseController {
     public AjaxResult specialAreaConsume() {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (ESpecialArea value : ESpecialArea.values()) {
-            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SPECIAL_AREA));
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
         }
         return AjaxResult.success(enumEntityList);
     }
@@ -476,7 +476,7 @@ public class EnumsController extends BaseController {
     public AjaxResult memberAchieve() {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (EMemberAchieve value : EMemberAchieve.values()) {
-            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), value.getProp(), EnumsPrefixConstants.MEMBER_ACHIEVE));
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), value.getProp()));
         }
         return AjaxResult.success(enumEntityList);
     }
@@ -488,7 +488,7 @@ public class EnumsController extends BaseController {
     public AjaxResult watertype() {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (EInfusingWaterType value : EInfusingWaterType.values()) {
-            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.INFUSING_WATER_TYPE));
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
         }
         return AjaxResult.success(enumEntityList);
     }

bd-business/bd-business-system/src/main/resources/mapper/system/config/BdAreaCurrencyMapper.xml

@@ -2,23 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.system.config.mapper.BdAreaCurrencyMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdAreaCurrency">
-        <id column="PK_ID" property="pkId" />
-        <result column="SPECIAL_AREA" property="specialArea" />
-        <result column="EFFECTIVE_DATE" property="effectiveDate" />
-        <result column="DEL_FLAG" property="delFlag" />
-        <result column="PK_COUNTRY" property="pkCountry" />
-        <result column="PK_CREATOR" property="pkCreator" />
-        <result column="CREATION_TIME" property="creationTime" />
-        <result column="PK_MODIFIED" property="pkModified" />
-        <result column="MODIFIED_TIME" property="modifiedTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        PK_ID, SPECIAL_AREA, EFFECTIVE_DATE, DEL_FLAG, PK_COUNTRY, PK_CREATOR, CREATION_TIME, PK_MODIFIED, MODIFIED_TIME
-    </sql>
-
 
 </mapper>

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java

@@ -1,6 +1,5 @@
 package com.hzs.common.core.enums;
 
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -38,7 +37,7 @@ public enum ESpecialArea {
     /**
      * 甄选专区
      */
-    RETAIL_UPGRADE(42, "甄选专区", 0,  42, -1),
+    RETAIL_UPGRADE(42, "甄选专区", 0, 42, -1),
     /**
      * 商城专区
      */

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrency.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hzs.common.core.annotation.Excel;
-import com.hzs.common.core.annotation.Transaction;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import com.hzs.common.core.web.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,9 +15,6 @@ import java.util.Date;
 
 /**
  * 消费配置表
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -40,7 +35,6 @@ public class BdAreaCurrency extends BaseEntity {
      * 所属专区
      */
     @TableField("SPECIAL_AREA")
-    @Transaction(transactionKey = EnumsPrefixConstants.SPECIAL_AREA)
     private Integer specialArea;
 
     /**

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrencyDetail.java

@@ -15,9 +15,6 @@ import java.math.BigDecimal;
 
 /**
  * 消费配置详情表
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdAreaCurrencyExt.java

@@ -9,9 +9,6 @@ import java.util.List;
 
 /**
  * 消费配置表
- *
- * @author zhangjing
- * @since 2022-08-26
  */
 @EqualsAndHashCode(callSuper = true)
 @Data