irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-08-01 19:00:32 +08:00
parent fc69d764d5
commit d3c72c151c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java
View File

@@ -308,7 +308,7 @@ public class WxCustomController {
customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().subtract(money), "1", "下单-指定单", money, BigDecimal.ZERO, orderId); 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.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("成功"); return R.ok("成功");
} }

6
play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
View File

@@ -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) { public void sendCreateOrderMessage(String tenantId, String openId, String nickName, String orderNo, String orderId, String orderTime, String orderAmount, String commodityName) {
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId);
String template_id = tenant.getXdcgtzTemplateId(); String template_id = tenant.getSdxddtzTemplateId();
String tenantKey = tenant.getTenantKey(); String tenantKey = tenant.getTenantKey();
String url = "http://" + tenantKey + ".july.hucs.top/clerk/#/orderDetail/" + orderId; String url = "http://" + tenantKey + ".july.hucs.top/clerk/#/orderDetail/" + orderId;
WxMpTemplateMessage templateMessage = new WxMpTemplateMessage(); WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();
@@ -140,7 +140,7 @@ public class WxCustomMpService {
templateMessage.setToUser(openId); templateMessage.setToUser(openId);
templateMessage.setUrl(url); templateMessage.setUrl(url);
List<WxMpTemplateData> data = new ArrayList<>(); List<WxMpTemplateData> 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("thing6", commodityName));
data.add(new WxMpTemplateData("amount8", orderAmount)); data.add(new WxMpTemplateData("amount8", orderAmount));
data.add(new WxMpTemplateData("thing12", nickName)); 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) { public void sendOrderMessage(String tenantId, String openId, String userType, String nickName, String orderNo, String orderId, String orderAmount) {
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId);
String template_id = tenant.getSdxddtzTemplateId(); String template_id = tenant.getXdcgtzTemplateId();
String tenantKey = tenant.getTenantKey(); String tenantKey = tenant.getTenantKey();
String url = "http://" + tenantKey + ".july.hucs.top/" + ("0".equals(userType) ? "user/#/orderDetail/" : "clerk/#/orderDetail/") + orderId; String url = "http://" + tenantKey + ".july.hucs.top/" + ("0".equals(userType) ? "user/#/orderDetail/" : "clerk/#/orderDetail/") + orderId;
WxMpTemplateMessage templateMessage = new WxMpTemplateMessage(); WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();