clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

催单/约单,以及公众号通知

This commit is contained in:
kuang.yife 2024-02-18 17:59:52 +08:00
parent 7cdbfe8e9d
commit d266225943
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -1097,6 +1097,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
orderListResponse.setPayMoney(totalPayMoney); orderListResponse.setPayMoney(totalPayMoney);
orderListResponse.setWorkerId(worker == null ? null : worker.getWorkerId());
orderListResponse.setWorkerName(workerName); orderListResponse.setWorkerName(workerName);
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customerAddress.getName()); orderListResponse.setCustomerName(customerAddress.getName());

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderWarnRecordController.java
View File

@ -116,7 +116,7 @@ public class OrderWarnRecordController extends BaseController
// 订单编号 // 订单编号
params.put("thing3", customer.getName()); params.put("thing3", customer.getName());
// 名称 // 名称
params.put("thing14", orderWarnRecord.getContent()); params.put("thing2", orderWarnRecord.getContent());
// 反馈时间 // 反馈时间
params.put("time6", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); params.put("time6", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
// 消息推送 // 消息推送

2
ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java
View File

@ -14,7 +14,7 @@ public enum WxMsgEnum {
/** 商城端消息通知 */ /** 商城端消息通知 */
CUSTOMER_ORDER("", "JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM"), CUSTOMER_ORDER("", "JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM"),
/** 测试 **/ /** 测试 **/
TEXT("", "JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM"), TEXT("", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ"),
/** 急报 **/ /** 急报 **/
WARN_ORDER("", "0RSuVHHP_okErJ1acQmIirBU7TrQYR0xPBgBHyt_azA") WARN_ORDER("", "0RSuVHHP_okErJ1acQmIirBU7TrQYR0xPBgBHyt_azA")

8
ghy-common/src/main/java/com/ghy/common/utils/WechatMsgUtils.java
View File

@ -67,13 +67,7 @@ public class WechatMsgUtils {
Map<String, Object> paramMap = new HashMap<String, Object>(); Map<String, Object> paramMap = new HashMap<String, Object>();
paramMap.put("touser", userOpenId); paramMap.put("touser", userOpenId);
paramMap.put("page", "index"); paramMap.put("page", "index");
switch (mesType) { paramMap.put("template_id", mesType.getTempCode());
case TEXT:
paramMap.put("template_id", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ");
break;
default:
break;
}
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
for (Map.Entry<String, Object> objectEntry : dataMap.entrySet()) { for (Map.Entry<String, Object> objectEntry : dataMap.entrySet()) {
JSONObject model = new JSONObject(); JSONObject model = new JSONObject();