diff --git a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitConstants.java b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitConstants.java index 697b18f56..c43827b41 100644 --- a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitConstants.java +++ b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitConstants.java @@ -29,6 +29,7 @@ public interface RabbitConstants { * 1,2,applySmsTemp 模版审核 * 1,2,sendMarkSms 发送营销短信 * 1,2,sendWechatTemp 发送微信模版消息 + * 1,2,groupBuyYes 拼团成功 * */ public static final String APPLY_SMS_TEMPLATE_QUEUE = "apply.sms.temp"; diff --git a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java index d5b61ad61..e12e06b54 100644 --- a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java +++ b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java @@ -106,9 +106,10 @@ public class RabbitPublisher { /** * 1,2,applySmsTemp 模版审核 shop_id,sms_shop_template.id,applySmsTemp * 1,2,sendMarkSms 发送营销短信 shop_id,sms_push_event.id,sendMarkSms - * 1,2,sendWechatTemp 发送微信模版消息 ? + * 1,2,sendWechatTemp 发送微信模版消息 shop_id,ac_push_event.id,sendWechatTemp + * 1,2,groupBuyYes 发送微信模版消息 shop_id,gb_order.id,groupBuyYes * @param param 店铺Id,主键Id - * @param type applySmsTemp,sendMarkSms,sendWechatTemp + * @param type applySmsTemp,sendMarkSms,sendWechatTemp,groupBuyYes */ public void sendApplySmsMsg(String param, String type) { sendMsg(RabbitConstants.Queue.APPLY_SMS_TEMPLATE_QUEUE, param + "," + type); @@ -117,7 +118,6 @@ public class RabbitPublisher { /** * 发送生日礼品短信队列 * - * @param param */ public void sendBirthdayGiftSmsMsg(String param) { sendMsg(RabbitConstants.Queue.BIRTHDAY_GIFT_SMS_QUEUE, param); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java index c58aa1488..0524a365e 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java @@ -8,6 +8,7 @@ import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopConfigService; import com.czg.account.service.ShopInfoService; import com.czg.account.service.ShopUserService; +import com.czg.config.RabbitPublisher; import com.czg.constant.MarketConstants; import com.czg.enums.OrderNoPrefixEnum; import com.czg.enums.YesNoEnum; @@ -71,7 +72,8 @@ public class GbOrderServiceImpl extends ServiceImpl impl @Resource @Lazy private PayService payService; - + @Resource + private RabbitPublisher rabbitPublisher; @DubboReference private ShopConfigService shopConfigService; @@ -290,24 +292,28 @@ public class GbOrderServiceImpl extends ServiceImpl impl record.setGroupOrderNo(order.getGroupOrderNo()); if ("success".equals(order.getStatus())) { record.setStatus("待核销"); + //推送 拼团成功 + sendMessage(order.getShopId(),order.getId()); } } else { GbOrder order = getOne(query().eq(GbOrder::getGroupOrderNo, record.getGroupOrderNo()) .eq(GbOrder::getShopId, record.getShopId())); order.setCurrentPeopleNum(order.getCurrentPeopleNum() + 1); if (order.getCurrentPeopleNum().equals(order.getGroupPeopleNum())) { - record.setStatus("待核销"); order.setStatus("success"); order.setGroupEndTime(LocalDateTime.now()); + wareService.upGbWareGroupedNum(order.getWareId()); + record.setStatus("待核销"); GbOrderDetail upRecord = new GbOrderDetail(); upRecord.setStatus("待核销"); - wareService.upGbWareGroupedNum(order.getWareId()); detailService.update(upRecord, query() .eq(GbOrderDetail::getGroupOrderNo, order.getGroupOrderNo()) .eq(GbOrderDetail::getShopId, order.getShopId()) .eq(GbOrderDetail::getIsDel, YesNoEnum.NO.value()) .eq(GbOrderDetail::getStatus, "待成团") ); + //推送 拼团成功 + sendMessage(order.getShopId(),order.getId()); } updateById(order); } @@ -462,4 +468,9 @@ public class GbOrderServiceImpl extends ServiceImpl impl upRecord.setCancelReason(reason); return detailService.update(upRecord, query().eq(GbOrderDetail::getId, record.getId())); } + + //推送 拼团成功 消息 + private void sendMessage(Long shopId, Long orderId) { + rabbitPublisher.sendApplySmsMsg(shopId + "," + orderId, "groupBuyYes"); + } }