From 7732016511247e3082ebd573dd493bc6d57e4518 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 21 Apr 2025 13:48:23 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=BB=B6=E7=BC=93=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E5=A5=96=E9=87=91=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=E5=8F=AA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E6=9C=9F=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java | 2 +- .../bonus/service/impl/BonusSettleFirstPurchaseHandle.java | 3 +-- .../com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java | 1 + .../bonus/bonus/service/impl/BonusSettlePurchaseHandle.java | 2 +- .../resources/mapper/member/achieve/CuMemberTreeMapper.xml | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java index 6d6c1eff..c0b6d4db 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java @@ -354,7 +354,7 @@ public interface CuMemberTreeMapper extends BaseMapper { * 批量根据订单信息查询会员结算表中的数据 * * @param settleTableName 结算表 - * @param period + * @param period 期间 * @param firPurchaseOrderList 首单列表 */ List batchQueryCuMemberSettlePlaceParent(@Param("settleTableName") String settleTableName, diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index 03ea5762..79cff4b8 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -419,7 +419,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // 根据开始期间、结束期间查询 List cuMemberBonusExpandList = new ArrayList<>(); // 获取所有订单的上级，根据订单往上一步步计算 - // key：订单ID，value：订单向上找安置人列表 + // TODO new key：订单ID，value：订单向上找安置人列表（会查询出来延缓发放奖金数据） Map> memberSettleMap = iCuMemberTreeService.batchQueryCuMemberSettlePlaceParent(settleTableName, period, firPurchaseOrderList); // 获取复购考核结果 @@ -1329,7 +1329,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { recordDetailVO.setBonusDelayDetailAddMap(new HashMap<>()); } - Map bonusDelayDetailAddMap = recordDetailVO.getBonusDelayDetailAddMap(); if (bonusDelayDetailAddMap.size() > 0) { // 拓展收益有延缓 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index 2945a7f9..48a094d6 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java @@ -806,6 +806,7 @@ public abstract class BonusSettleHandle { protected CuMemberBonus getCuMemberBonus(Integer period, Map cuMemberBonusMap, SaOrder saOrder, CuMemberSettleExt cuMemberSettleExt) { Integer pkRate = saOrder.getPkRate(); if (pkRate == null || !Objects.equals(cuMemberSettleExt.getPkSettleCountry(), saOrder.getPkCountry())) { + // 结算会员和订单不是一个国家的，需要按结算会员的汇率进行处理 CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(cuMemberSettleExt.getPkSettleCountry()).getData(); pkRate = currencyDTO.getPkId(); } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index 76e12c4a..bc0baa48 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -143,7 +143,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { Map weekMemberBonusMap, Map cuMemberBonusMap, Map cuBonusExpandExtMap) { List cuMemberBonusExpandList = new ArrayList<>(); // 获取所有订单的上级，根据订单往上一步步计算 - // key：订单ID，value：订单向上找安置人列表 + // TODO new key：订单ID，value：订单向上找安置人列表（会查询出来延缓发放奖金数据） Map> memberSettleMap = iCuMemberTreeService.batchQueryCuMemberSettlePlaceParent(settleTableName, period, purchaseOrderList); // 订单安置上找所有会员列表 diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index d5e460b1..45d2e56f 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -1374,6 +1374,7 @@ from (select cmbd.pk_member, max(cmbd.period) period from cu_member_bonus_delay cmbd where cmbd.del_flag = 0 + and #{period} > cmbd.period group by cmbd.pk_member) t where t.pk_member = cmbd.pk_member and t.period = cmbd.period)