diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java index 9b5ad35..551377e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java @@ -1,11 +1,16 @@ package com.starry.admin.modules.order.controller; import com.starry.admin.common.exception.CustomException; +import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; +import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.module.entity.PlayOrderRandomInfoEntity; import com.starry.admin.modules.order.module.vo.*; import com.starry.admin.modules.order.service.IPlayOrderInfoService; import com.starry.admin.modules.order.service.IPlayOrderRandomInfoService; +import com.starry.admin.modules.play.module.vo.PlayCommodityInfoVo; +import com.starry.admin.modules.play.service.IPlayCommodityInfoService; +import com.starry.admin.modules.weichat.service.WxCustomMpService; import com.starry.common.annotation.Log; import com.starry.common.context.CustomSecurityContextHolder; import com.starry.common.enums.BusinessType; @@ -31,6 +36,14 @@ public class PlayOrderInfoController { @Resource private IPlayOrderRandomInfoService playOrderRandomInfoService; + @Resource + private WxCustomMpService wxCustomMpService; + @Resource + private IPlayClerkUserInfoService playClerkUserInfoService; + + @Resource + private IPlayCommodityInfoService playCommodityInfoService; + /** * 分页查询订单列表 @@ -78,6 +91,10 @@ public class PlayOrderInfoController { @PostMapping("/orderEditAcceptBy") public R orderEditAcceptBy(@Validated @RequestBody PlayOrderEditAcceptByVo vo) { orderInfoService.updateStateTo1("2", CustomSecurityContextHolder.getUserId(), vo.getAcceptBy(), vo.getOrderId()); + PlayClerkUserInfoEntity clerkUserInfo = playClerkUserInfoService.selectById(vo.getAcceptBy()); + PlayOrderInfoEntity orderInfo = orderInfoService.selectOrderInfoById(vo.getOrderId()); + PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(orderInfo.getCommodityId()); + wxCustomMpService.sendCreateOrderMessage(clerkUserInfo.getTenantId(), clerkUserInfo.getOpenid(), clerkUserInfo.getNickname(), orderInfo.getOrderNo(), orderInfo.getId(), String.valueOf(orderInfo.getPurchaserTime()), orderInfo.getOrderMoney().toString(), commodityInfo.getCommodityName()); return R.ok("操作成功"); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index fd8c470..7c868cb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -647,8 +647,6 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl data = new ArrayList<>(); + data.add(new WxMpTemplateData("time5", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); + data.add(new WxMpTemplateData("thing6", commodityName)); + data.add(new WxMpTemplateData("amount8", orderAmount)); + data.add(new WxMpTemplateData("thing12", nickName)); + data.add(new WxMpTemplateData("character_string2", orderNo)); + data.add(new WxMpTemplateData("time7", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); + templateMessage.setData(data); + try { + proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage); + } catch (WxErrorException e) { + log.error(e.getMessage(), e); + + } + } /** * 通过微信公众号发送消息 * @@ -125,7 +163,7 @@ public class WxCustomMpService { * @param orderNo 消息内容-订单编号 * @param orderId 消息内容-订单ID * @param orderAmount 消息内容-订单金额 - * @author 杭州世平信息科技有限公司-xuhq + * @author admin * @since 2024/7/31 10:51 **/ public void sendOrderMessage(String tenantId, String openId, String userType, String nickName, String orderNo, String orderId, String orderAmount) {