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

## 延缓发放奖金查询语句只查询当前期之前的；

This commit is contained in:
cabbage 2025-04-21 13:48:23 +08:00
parent ee90ebd0b2
commit 7732016511
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java
View File

@ -354,7 +354,7 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
* 批量根据订单信息查询会员结算表中的数据 * 批量根据订单信息查询会员结算表中的数据
* *
* @param settleTableName 结算表 * @param settleTableName 结算表
* @param period * @param period 期间
* @param firPurchaseOrderList 首单列表 * @param firPurchaseOrderList 首单列表
*/ */
List<CuMemberSettleExt> batchQueryCuMemberSettlePlaceParent(@Param("settleTableName") String settleTableName, List<CuMemberSettleExt> batchQueryCuMemberSettlePlaceParent(@Param("settleTableName") String settleTableName,

3
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
View File

@ -419,7 +419,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
// 根据开始期间、结束期间查询 // 根据开始期间、结束期间查询
List<CuMemberBonusExpand> cuMemberBonusExpandList = new ArrayList<>(); List<CuMemberBonusExpand> cuMemberBonusExpandList = new ArrayList<>();
// 获取所有订单的上级，根据订单往上一步步计算 // 获取所有订单的上级，根据订单往上一步步计算
// key：订单ID，value：订单向上找安置人列表 // TODO new key：订单ID，value：订单向上找安置人列表（会查询出来延缓发放奖金数据）
Map<Long, List<CuMemberSettleExt>> memberSettleMap = iCuMemberTreeService.batchQueryCuMemberSettlePlaceParent(settleTableName, period, firPurchaseOrderList); Map<Long, List<CuMemberSettleExt>> memberSettleMap = iCuMemberTreeService.batchQueryCuMemberSettlePlaceParent(settleTableName, period, firPurchaseOrderList);
// 获取复购考核结果 // 获取复购考核结果
@ -1329,7 +1329,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
recordDetailVO.setBonusDelayDetailAddMap(new HashMap<>()); recordDetailVO.setBonusDelayDetailAddMap(new HashMap<>());
} }
Map<Long, CuMemberBonusDelayDetail> bonusDelayDetailAddMap = recordDetailVO.getBonusDelayDetailAddMap(); Map<Long, CuMemberBonusDelayDetail> bonusDelayDetailAddMap = recordDetailVO.getBonusDelayDetailAddMap();
if (bonusDelayDetailAddMap.size() > 0) { if (bonusDelayDetailAddMap.size() > 0) {
// 拓展收益有延缓 // 拓展收益有延缓

1
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
View File

@ -806,6 +806,7 @@ public abstract class BonusSettleHandle {
protected CuMemberBonus getCuMemberBonus(Integer period, Map<Long, CuMemberBonus> cuMemberBonusMap, SaOrder saOrder, CuMemberSettleExt cuMemberSettleExt) { protected CuMemberBonus getCuMemberBonus(Integer period, Map<Long, CuMemberBonus> cuMemberBonusMap, SaOrder saOrder, CuMemberSettleExt cuMemberSettleExt) {
Integer pkRate = saOrder.getPkRate(); Integer pkRate = saOrder.getPkRate();
if (pkRate == null || !Objects.equals(cuMemberSettleExt.getPkSettleCountry(), saOrder.getPkCountry())) { if (pkRate == null || !Objects.equals(cuMemberSettleExt.getPkSettleCountry(), saOrder.getPkCountry())) {
// 结算会员和订单不是一个国家的，需要按结算会员的汇率进行处理
CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(cuMemberSettleExt.getPkSettleCountry()).getData(); CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(cuMemberSettleExt.getPkSettleCountry()).getData();
pkRate = currencyDTO.getPkId(); pkRate = currencyDTO.getPkId();
} }

2
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
View File

@ -143,7 +143,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
Map<Long, CuMemberBonus> weekMemberBonusMap, Map<Long, CuMemberBonus> cuMemberBonusMap, Map<Long, CuBonusExpandExt> cuBonusExpandExtMap) { Map<Long, CuMemberBonus> weekMemberBonusMap, Map<Long, CuMemberBonus> cuMemberBonusMap, Map<Long, CuBonusExpandExt> cuBonusExpandExtMap) {
List<CuMemberBonusExpand> cuMemberBonusExpandList = new ArrayList<>(); List<CuMemberBonusExpand> cuMemberBonusExpandList = new ArrayList<>();
// 获取所有订单的上级，根据订单往上一步步计算 // 获取所有订单的上级，根据订单往上一步步计算
// key：订单ID，value：订单向上找安置人列表 // TODO new key：订单ID，value：订单向上找安置人列表（会查询出来延缓发放奖金数据）
Map<Long, List<CuMemberSettleExt>> memberSettleMap = iCuMemberTreeService.batchQueryCuMemberSettlePlaceParent(settleTableName, period, purchaseOrderList); Map<Long, List<CuMemberSettleExt>> memberSettleMap = iCuMemberTreeService.batchQueryCuMemberSettlePlaceParent(settleTableName, period, purchaseOrderList);
// 订单安置上找所有会员列表 // 订单安置上找所有会员列表

1
hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
View File

@ -1374,6 +1374,7 @@
from (select cmbd.pk_member, max(cmbd.period) period from (select cmbd.pk_member, max(cmbd.period) period
from cu_member_bonus_delay cmbd from cu_member_bonus_delay cmbd
where cmbd.del_flag = 0 where cmbd.del_flag = 0
and #{period} > cmbd.period
group by cmbd.pk_member) t group by cmbd.pk_member) t
where t.pk_member = cmbd.pk_member where t.pk_member = cmbd.pk_member
and t.period = cmbd.period) and t.period = cmbd.period)