From db93342274f4cf950d5014932ec865c5cba95c81 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Wed, 2 Jul 2025 13:53:29 +0800 Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E9=9B=B6=E5=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamicdatasource/service/impl/SendMsgServiceImpl.java | 7 +++---- src/main/resources/mapper/SaOrderMapper.xml | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/angelo/dynamicdatasource/service/impl/SendMsgServiceImpl.java b/src/main/java/com/angelo/dynamicdatasource/service/impl/SendMsgServiceImpl.java index 47a5d4c..31f023c 100644 --- a/src/main/java/com/angelo/dynamicdatasource/service/impl/SendMsgServiceImpl.java +++ b/src/main/java/com/angelo/dynamicdatasource/service/impl/SendMsgServiceImpl.java @@ -66,11 +66,10 @@ public class SendMsgServiceImpl implements ISendMsgService { orderAmount = ComputeUtil.computeMultiply(ComputeUtil.computeDivide(orderAmount, outRate), 1); } if(dsKey.equals("retail")) { - if (Objects.equals(EOrderTypeRetail.REGISTER_ORDER.getValue(), saOrderExt.getOrderType()) || - Objects.equals(EOrderTypeRetail.RETAIL_UPGRADE.getValue(), saOrderExt.getOrderType())) { + // 注册+升级=首购 + if (Objects.equals(EOrderTypeRetail.RETAIL_REGISTER.getValue(), saOrderExt.getOrderType())) { registerAchieve = ComputeUtil.computeAdd(registerAchieve, orderAmount); - } else if (Objects.equals(EOrderTypeRetail.RETAIL_UPGRADE.getValue(), saOrderExt.getOrderType()) || - Objects.equals(EOrderTypeRetail.RETAIL_UPGRADE.getValue(), saOrderExt.getOrderType())) { + } else if (Objects.equals(EOrderTypeRetail.RETAIL_UPGRADE.getValue(), saOrderExt.getOrderType())) { updateAchieve = ComputeUtil.computeAdd(updateAchieve, orderAmount); } else { if (Objects.equals(EOrderTypeRetail.RETAIL_REPURCHASE.getValue(), saOrderExt.getOrderType())) { diff --git a/src/main/resources/mapper/SaOrderMapper.xml b/src/main/resources/mapper/SaOrderMapper.xml index ccf8518..bbb3e48 100644 --- a/src/main/resources/mapper/SaOrderMapper.xml +++ b/src/main/resources/mapper/SaOrderMapper.xml @@ -129,7 +129,6 @@ st.specs_name, st.ass_achievement, st.is_maker_gift, - st.USE_PICK, 0 channel, sb.pk_order pk_bonus_order, bt.bonus_value pk_bonus_items,