diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java index 6f7ae1c..0095b68 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java @@ -308,7 +308,7 @@ public class WxCustomController { customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().subtract(money), "1", "下单-指定单", money, BigDecimal.ZERO, orderId); //发送通知给店员 wxCustomMpService.sendCreateOrderMessage(clerkUserInfo.getTenantId(), clerkUserInfo.getOpenid(), clerkUserInfo.getNickname(), orderNo, orderId, DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"), money.toString(), commodityInfo.getCommodityName()); - wxCustomMpService.sendNewOrderMessageForClerk(clerkUserInfo, orderNo, commodityInfo.getCommodityName(), money); +// wxCustomMpService.sendNewOrderMessageForClerk(clerkUserInfo, orderNo, commodityInfo.getCommodityName(), money); return R.ok("成功"); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java index 113b9ef..bddf86c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java @@ -132,7 +132,7 @@ public class WxCustomMpService { */ public void sendCreateOrderMessage(String tenantId, String openId, String nickName, String orderNo, String orderId, String orderTime, String orderAmount, String commodityName) { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); - String template_id = tenant.getXdcgtzTemplateId(); + String template_id = tenant.getSdxddtzTemplateId(); String tenantKey = tenant.getTenantKey(); String url = "http://" + tenantKey + ".july.hucs.top/clerk/#/orderDetail/" + orderId; WxMpTemplateMessage templateMessage = new WxMpTemplateMessage(); @@ -140,7 +140,7 @@ public class WxCustomMpService { templateMessage.setToUser(openId); templateMessage.setUrl(url); List data = new ArrayList<>(); - data.add(new WxMpTemplateData("time5", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); + data.add(new WxMpTemplateData("time5", orderTime)); data.add(new WxMpTemplateData("thing6", commodityName)); data.add(new WxMpTemplateData("amount8", orderAmount)); data.add(new WxMpTemplateData("thing12", nickName)); @@ -170,7 +170,7 @@ public class WxCustomMpService { **/ public void sendOrderMessage(String tenantId, String openId, String userType, String nickName, String orderNo, String orderId, String orderAmount) { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); - String template_id = tenant.getSdxddtzTemplateId(); + String template_id = tenant.getXdcgtzTemplateId(); String tenantKey = tenant.getTenantKey(); String url = "http://" + tenantKey + ".july.hucs.top/" + ("0".equals(userType) ? "user/#/orderDetail/" : "clerk/#/orderDetail/") + orderId; WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();