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

Compare commits

base: angelo:d7e478bbbdf4e0acd691a8f57a208da42231bb8a
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
..
compare: angelo:485cc1bfc8aa4b4629f3c5d48d09e4b3c6134a12
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:master

No commits in common. "d7e478bbbdf4e0acd691a8f57a208da42231bb8a" and "485cc1bfc8aa4b4629f3c5d48d09e4b3c6134a12" have entirely different histories.
d7e478bbbd ... 485cc1bfc8

24 changed files with 303 additions and 215 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

@ -36,8 +36,8 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
.pkSettleCountry(CountryConstants.CHINA_COUNTRY) .pkSettleCountry(CountryConstants.CHINA_COUNTRY)
.pkGrade(cuMember.getPkSettleGrade()) .pkGrade(cuMember.getPkSettleGrade())
.pkAwards(cuMember.getPkAwards()) .pkAwards(cuMember.getPkAwards())
// .pkRangeAwards(cuMember.getPkRangeAwards()) .pkRangeAwards(cuMember.getPkRangeAwards())
// .pkMaxAwards(cuMember.getPkMaxAwards()) .pkMaxAwards(cuMember.getPkMaxAwards())
.build()).getData(); .build()).getData();
// 会员标记（0=正常会员） // 会员标记（0=正常会员）
@ -68,10 +68,10 @@ public class MemberRetailServiceImpl implements IMemberRetailService {
.gradeIcon(memberDataDTO.getGradeIcon()) .gradeIcon(memberDataDTO.getGradeIcon())
.pkAwardsVal(memberDataDTO.getAwardsVal()) .pkAwardsVal(memberDataDTO.getAwardsVal())
.awardsIcon(memberDataDTO.getAwardsIcon()) .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()) .currencyIcon(memberDataDTO.getCurrencyIcon())
.memberSign(memberSign) .memberSign(memberSign)
.control(control) .control(control)

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

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

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

@ -84,23 +84,23 @@ public class RetailMemberInfoVO implements Serializable {
*/ */
private String awardsIcon; 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;
/** /**
* 币种图标 * 币种图标

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

@ -452,31 +452,6 @@
cu.MEMBER_CODE, cu.MEMBER_CODE,
mr.ENABLE_STATUS, 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,
mr.ENABLE_STATUS,
NVL( mr.CONSUME_PV, 0 ) consumePv, NVL( mr.CONSUME_PV, 0 ) consumePv,
NVL( mr.REG_CONSUME_NEW_PV + mr.REP_CONSUME_NEW_PV, 0 ) newConsumePv, NVL( mr.REG_CONSUME_NEW_PV + mr.REP_CONSUME_NEW_PV, 0 ) newConsumePv,
@ -497,7 +472,6 @@
</foreach> </foreach>
</if> </if>
</where> </where>
-->
</select> </select>
<select id="getMarketDynamicsDetail" resultType="com.hzs.retail.member.vo.MarketDynamicsDetailVO"> <select id="getMarketDynamicsDetail" resultType="com.hzs.retail.member.vo.MarketDynamicsDetailVO">

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

@ -94,18 +94,6 @@ public class SaDeliverController extends BaseController {
for (DeliverVO deliver : resultList) { for (DeliverVO deliver : resultList) {
// 省市区处理 // 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliver); 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); return getDataTable(resultList);
@ -154,12 +142,12 @@ public class SaDeliverController extends BaseController {
// 省市区处理 // 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliver); OrderUtil.handleOrderAddress(areaMap, deliver);
deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel()); deliver.setDeliverStatusVal(transactionMap.get(EnumsPrefixConstants.DELIVERY_STATUS + deliver.getDeliverStatus()));
deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay())); deliver.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliver.getDeliveryWay()));
deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope())); deliver.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliver.getOperateScope()));
deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType())); deliver.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliver.getOrderType()));
deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType())); deliver.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliver.getTranType()));
deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel())); deliver.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliver.getShippingChannel()));
} }
} }
ExcelUtil<DeliverVO> util = new ExcelUtil<>(DeliverVO.class); ExcelUtil<DeliverVO> util = new ExcelUtil<>(DeliverVO.class);

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

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

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

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

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

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

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

@ -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()) { if (null != memberDataDTO.getPkSettleCountry()) {
BdCurrency bdCurrency = iBdCurrencyService.getCurrency(memberDataDTO.getPkSettleCountry()); BdCurrency bdCurrency = iBdCurrencyService.getCurrency(memberDataDTO.getPkSettleCountry());

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

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

@ -8,6 +8,9 @@ import java.util.List;
/** /**
* 消费配置详情表 Mapper 接口 * 消费配置详情表 Mapper 接口
*
* @author zhangjing
* @since 2022-08-26
*/ */
public interface BdAreaCurrencyDetailMapper extends BaseMapper<BdAreaCurrencyDetail> { public interface BdAreaCurrencyDetailMapper extends BaseMapper<BdAreaCurrencyDetail> {
@ -28,7 +31,11 @@ public interface BdAreaCurrencyDetailMapper extends BaseMapper<BdAreaCurrencyDet
BdAreaCurrencyDetail checkDeductSort(BdAreaCurrencyDetail areaCurrencyDetail); 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); List<BdAreaCurrencyDetailExt> getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt);

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

@ -1,10 +1,17 @@
package com.hzs.system.config.mapper; package com.hzs.system.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.system.config.BdAreaCurrency; import com.hzs.common.domain.system.config.BdAreaCurrency;
/** /**
* <p>
* 消费配置表 Mapper 接口 * 消费配置表 Mapper 接口
* </p>
*
* @author zhangjing
* @since 2022-08-26
*/ */
public interface BdAreaCurrencyMapper extends BaseMapper<BdAreaCurrency> { 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,6 +8,9 @@ import java.util.List;
/** /**
* 消费配置详情表 服务类 * 消费配置详情表 服务类
*
* @author zhangjing
* @since 2022-08-26
*/ */
public interface IBdAreaCurrencyDetailService extends IService<BdAreaCurrencyDetail> { public interface IBdAreaCurrencyDetailService extends IService<BdAreaCurrencyDetail> {
@ -28,7 +31,11 @@ public interface IBdAreaCurrencyDetailService extends IService<BdAreaCurrencyDet
BdAreaCurrencyDetail checkDeductSort(BdAreaCurrencyDetail areaCurrencyDetail); 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); List<BdAreaCurrencyDetailExt> getAreaCurrencyDetailList(BdAreaCurrencyDetailExt areaCurrencyDetailExt);

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

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

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

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

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

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

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

@ -2,5 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <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> </mapper>

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

@ -1,5 +1,6 @@
package com.hzs.common.core.enums; package com.hzs.common.core.enums;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

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

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

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

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

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

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