angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 消费配置取值走枚举；

This commit is contained in:
cabbage 2025-10-10 09:40:30 +08:00
parent 94a95d2abc
commit 8e65bc6945
12 changed files with 57 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<>();
queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry());
LambdaQueryWrapper<BdAreaCurrency> queryWrapper = new LambdaQueryWrapper<>();
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.orderByDesc("EFFECTIVE_DATE");
List<BdAreaCurrency> list = areaCurrencyParamService.list(queryWrapper);
queryWrapper.orderByAsc(BdAreaCurrency::getSpecialArea);
queryWrapper.orderByDesc(BdAreaCurrency::getEffectiveDate);
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<>();
queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry());
LambdaQueryWrapper<BdAreaCurrency> queryWrapper = new LambdaQueryWrapper<>();
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");
List<BdAreaCurrency> list = areaCurrencyParamService.list(queryWrapper);
queryWrapper.orderByAsc(BdAreaCurrency::getEffectiveDate);
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.setModifiedTime(date);
areaCurrency.setPkModified(SecurityUtils.getUserId());
areaCurrency.setModifiedTime(new Date());
areaCurrency.setPkId(pkId);
return toAjax(areaCurrencyParamService.delAreaCurrency(areaCurrency));
return toAjax(iBdAreaCurrencyService.delAreaCurrency(areaCurrency));
}
}

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

@ -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);

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

@ -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> {

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

@ -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);

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

@ -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);

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

@ -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);

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

@ -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;
@Autowired
private IBdAreaCurrencyDetailService areaCurrencyParamDetailService;
private IBdAreaCurrencyDetailService iBdAreaCurrencyDetailService;
@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<>();
updateWrapper.set("DEL_FLAG", EYesNo.NO.getIntValue());
updateWrapper.eq("PK_AREA_CURRENCY", areaCurrencyExt.getPkId());
updateWrapper.eq("DEL_FLAG", EYesNo.YES.getIntValue());
areaCurrencyDetailService.update(updateWrapper);
LambdaUpdateWrapper<BdAreaCurrencyDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(BdAreaCurrencyDetail::getDelFlag, EYesNo.NO.getIntValue());
updateWrapper.eq(BdAreaCurrencyDetail::getPkAreaCurrency, areaCurrencyExt.getPkId());
updateWrapper.eq(BdAreaCurrencyDetail::getDelFlag, EYesNo.YES.getIntValue());
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<>();
updateWrapper.eq("PK_AREA_CURRENCY", bdAreaCurrency.getPkId());
updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
updateWrapper.set("PK_MODIFIED", bdAreaCurrency.getPkModified());
updateWrapper.set("MODIFIED_TIME", bdAreaCurrency.getModifiedTime());
LambdaUpdateWrapper<BdAreaCurrencyDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(BdAreaCurrencyDetail::getPkAreaCurrency, bdAreaCurrency.getPkId());
updateWrapper.set(BdAreaCurrencyDetail::getDelFlag, EDelFlag.DELETE.getValue());
updateWrapper.set(BdAreaCurrencyDetail::getPkModified, bdAreaCurrency.getPkModified());
updateWrapper.set(BdAreaCurrencyDetail::getModifiedTime, bdAreaCurrency.getModifiedTime());
areaCurrencyParamDetailService.update(updateWrapper);
iBdAreaCurrencyDetailService.update(updateWrapper);
bdAreaCurrency.setDelFlag(EDelFlag.DELETE.getValue());
UpdateWrapper<BdAreaCurrency> updateWrapper1 = new UpdateWrapper<>();
updateWrapper1.eq("PK_ID", bdAreaCurrency.getPkId());
updateWrapper1.set("DEL_FLAG", EDelFlag.DELETE.getValue());
updateWrapper1.set("PK_MODIFIED", bdAreaCurrency.getPkModified());
updateWrapper1.set("MODIFIED_TIME", bdAreaCurrency.getModifiedTime());
LambdaUpdateWrapper<BdAreaCurrency> updateWrapper1 = new LambdaUpdateWrapper<>();
updateWrapper1.eq(BdAreaCurrency::getPkId, bdAreaCurrency.getPkId());
updateWrapper1.set(BdAreaCurrency::getDelFlag, EDelFlag.DELETE.getValue());
updateWrapper1.set(BdAreaCurrency::getPkModified, bdAreaCurrency.getPkModified());
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)) {

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

@ -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>

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

@ -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),
/**
* 商城专区
*/

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

@ -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;
/**

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

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

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

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