From dab7999c9c153974060c9f3b1441e255fe324936 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 5 Aug 2025 15:15:08 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=A7=92=E6=9D=80=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8C=89=E5=A4=8D=E8=B4=AD=E8=B5=B0=E4=B8=9A=E7=BB=A9=E5=92=8C?= =?UTF-8?q?=E5=A5=96=E9=87=91=E5=A4=84=E7=90=86=EF=BC=9B=E7=A7=92=E6=9D=80?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8B=A8=E6=AF=94=E7=AE=97=E5=9C=A8=E5=A4=8D?= =?UTF-8?q?=E8=B4=AD=E9=87=8C=E9=9D=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/service/impl/BonusSettleMallHandle.java | 11 ++--------- .../bonus/service/impl/BonusSettleServiceImpl.java | 5 +++-- .../statis/service/impl/CuBonusStatisServiceImpl.java | 3 ++- .../service/impl/CuBonusVertexStatisServiceImpl.java | 3 ++- .../mapper/member/statis/CuBonusStatisMapper.xml | 2 +- .../member/statis/CuBonusVertexStatisMapper.xml | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java index 30e0a903..9819f633 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleMallHandle.java @@ -9,20 +9,13 @@ import org.springframework.stereotype.Component; import java.util.*; /** - * @Description: 计算商城订单 - * @Author: sui q - * @Time: 2023/2/10 17:56 - * @Classname: BonusSettleMallHandle - * @PackageName: com.hzs.member.bonus.service.impl + * 计算商城订单 */ @Component public class BonusSettleMallHandle extends BonusSettleHandle { /** - * @Description: 计算商城业绩，用于计算商城业绩 - * @return: void - * @Author: sui q - * @Date: 2022/11/10 14:17 + * 计算商城业绩，用于计算商城业绩 */ void calculateMallBonus(Map cuMemberSettleExtMap, String settleTableName, List mallSaOrderList, BonusConfigDTO bonusConfigDTO) { List queryMallSaOrderList = new ArrayList<>(); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index e9d2d7bd..565ef418 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -992,10 +992,11 @@ public class BonusSettleServiceImpl implements IBonusSettleService { firPurchaseOrderList.add(saOrderExt); } else if (Objects.equals(EOrderType.FICTITIOUS_ORDER.getValue(), saOrderExt.getOrderType())) { firPurchaseOrderList.add(saOrderExt); - } else if (Objects.equals(EOrderType.REPURCHASE_ORDER.getValue(), saOrderExt.getOrderType())) { + } else if (Objects.equals(EOrderType.REPURCHASE_ORDER.getValue(), saOrderExt.getOrderType()) + || Objects.equals(EOrderType.MALL_ORDER.getValue(), saOrderExt.getOrderType())) { repurchaseOrderList.add(saOrderExt); } else { - mallOrderList.add(saOrderExt); +// mallOrderList.add(saOrderExt); // 商城订单也计算复购量奖 repurchaseOrderList.add(saOrderExt); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java index 533d6948..ed6f462f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java @@ -138,7 +138,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl and so.pk_country = #{pkCountry} diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml index 587ef2c3..0d3320a7 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml @@ -774,7 +774,7 @@ connect by pk_place_parent = prior pk_member ) cm INNER JOIN SA_ORDER so on so.pk_member = cm.pk_member - where so.ORDER_TYPE in (1, 2, 3, 20, 24, 25, 26) + where so.ORDER_TYPE in (1, 2, 3, 14, 20, 24, 25, 26) and so.pk_country = #{pkCountry}