From 042761aec463c6bd6203543d91ef8cc8a0a1085e Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 6 May 2025 11:59:09 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=A7=92=E7=BB=93=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E5=A4=84=E7=90=86=EF=BC=9B=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=9A=82=E6=97=B6=E4=B8=8D=E6=8E=A8=E9=80=81?= =?UTF-8?q?MQ=E7=A7=92=E7=BB=93=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CuMemberTreeServiceImpl.java | 2 +- .../bonus/bonus/service/impl/BonusSettleHandle.java | 2 ++ .../hzs/bonus/listener/SaOrderSecondListener.java | 2 +- .../mapper/member/achieve/CuMemberTreeMapper.xml | 8 +++++--- .../sale/order/service/impl/SaOrderServiceImpl.java | 12 ++++++------ 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java index dd5a2cdd..aa190b48 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -412,7 +412,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl cuMemberTreeList, Integer isPlace) { - if (DateUtils.getCurrentHour() < 2) { + if (DateUtils.getCurrentHour() < 1) { settleTableName = yesSettleTableName; } baseMapper.updateCuMemberSecondPlaceParent(secondTableName, settleTableName, pkMember, cuMemberTreeList, isPlace); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index 80e4822b..e83d1fc0 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java @@ -420,6 +420,8 @@ public abstract class BonusSettleHandle { cuMemberSettleExt.setRepurchaseBloNewPv(BigDecimal.ZERO); cuMemberSettleExt.setHiFunBloNewPv(BigDecimal.ZERO); cuMemberSettleExt.setMallBloNewPv(BigDecimal.ZERO); + cuMemberSettleExt.setANewBox(0); + cuMemberSettleExt.setBNewBox(0); cuMemberSettleExtMap.put(cuMemberSettleExt.getPkMember(), cuMemberSettleExt); } }); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java index a25f52fe..a1710cca 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java @@ -33,7 +33,7 @@ public class SaOrderSecondListener { channel.basicAck(deliveryTag, false); try { Thread.sleep(500); - // 乐享订单当日订单只计算奖衔 + // 订单当日订单只计算奖衔 bonusSettleService.calculateCumberBonusBySecond(saOrderExt.getOrderCode()); } catch (Exception e) { e.printStackTrace(); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index ff82f64c..96686086 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -517,7 +517,7 @@ #{item.hiFunAmount} hi_fun_amount, #{item.hiFunPv} hi_fun_pv, #{item.hiFunNewPv} hi_fun_new_pv, #{item.mallAmount} mall_amount, #{item.mallPv} mall_pv, #{item.mallNewPv} mall_new_pv, #{item.minAchieve} min_achieve, #{item.round} round, #{item.second} second , - #{item.aNewBox} a_new_box, #{item.bNewBox} b_new_box, + #{item.aNewBox} a_new_box, #{item.bNewBox} b_new_box from dual ) b @@ -1070,11 +1070,13 @@ st.repurchase_amount,st.repurchase_pv,st.repurchase_new_amount,st.repurchase_new_pv, st.hi_fun_amount,st.hi_fun_pv,st.hi_fun_new_amount,st.hi_fun_new_pv, st.mall_amount,st.mall_pv,st.mall_new_amount,st.mall_new_pv, - st.round,st.second,st.min_achieve,st.expire_status from + st.round,st.second,st.min_achieve,st.expire_status + from ( select pk_id,pk_parent,pk_place_parent,place_dept,member_code,member_name,pk_center_code,pk_settle_grade pk_grade,pk_awards,account_status,register_authority,customer_type, - income_status,pk_settle_country,purchase_status,share_status,category,is_maker_space from cu_member + income_status,pk_settle_country,purchase_status,share_status,category,is_maker_space + from cu_member where del_flag= 0 and pk_id in #{item} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 3538f7ac..e6e20cca 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -912,9 +912,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl sendMessage(newCuMember); log.info("生产活动消息,activity.exchange:{}", JSONUtil.toJsonStr(saOrderExt)); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); - //计算奖金,通过mq分发消息,异步处理 - log.info("生产秒结消息,order.second.exchange:{}", JSONUtil.toJsonStr(saOrderExt)); - rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); +// //计算奖金,通过mq分发消息,异步处理 +// log.info("生产秒结消息,order.second.exchange:{}", JSONUtil.toJsonStr(saOrderExt)); +// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { // 推送会员续约处理MQ @@ -1066,7 +1066,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl throw new RuntimeException("保存会员失败!!!"); } try { - rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); +// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { @@ -1173,8 +1173,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl .eMemberContinue(EMemberContinue.BUY_GIFT) .build()); } - // 推送秒结数据 - rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); +// // 推送秒结数据 +// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); } catch (Exception e) { e.printStackTrace(); }