From 8c167a91ac251d3c35f10aa831c3f28d6729047e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Sep 2022 18:31:16 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 11 +++++------
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 2 +-
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 10 +++++-----
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 12 +++++-------
src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java | 4 ++++
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index 563210e..0454312 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -10,7 +10,7 @@
WX_TEMPLATE_ID_ONE("WX_TEMPLATE", "WX_TEMPLATE_ID_ONE"),
// 充值到账通知
WX_TEMPLATE_ID_TWO("WX_TEMPLATE", "WX_TEMPLATE_ID_TWO"),
- // 订单自提通知
+ // 提货通知
WX_TEMPLATE_ID_THREE("WX_TEMPLATE", "WX_TEMPLATE_ID_THREE"),
//配送设置
HOME_DELIVERY_AMOUNT("DELIVERY_SETTING", "HOME_DELIVERY_AMOUNT"),
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index ae56cf4..71b604a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -345,16 +345,14 @@
mallOrderInfoMapper.updateById(mallOrderInfo);
OrderStateDto orderStateDto = new OrderStateDto();
- orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
- orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
- orderStateDto.setOrderState("待自提");
- orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
+ orderStateDto.setGoodsName(StrUtil.sub(productNames,0,15)+"...");
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
- orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,10)+"...");
- orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,10)+"...");
- orderStateDto.setAmount(mallOrderInfo.getAmount().toString());
+ orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,20)+"...");
+ orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
+ orderStateDto.setRemark("果蔬等生鲜,请尽快取货");
+ orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());
orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getCode());
orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index df36416..d70d896 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -203,18 +203,17 @@
mallOrderInfoMapper.updateById(mallOrderInfo);
OrderStateDto orderStateDto = new OrderStateDto();
- orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
- orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
- orderStateDto.setOrderState("待自提");
- orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
+ orderStateDto.setGoodsName(StrUtil.sub(productNames,0,20)+"...");
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
- orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,10)+"...");
- orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,10)+"...");
+ orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,20)+"...");
+ orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
+ orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());
orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getCode());
orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
+ orderStateDto.setRemark("果蔬等生鲜,请尽快取货");
iXcxPayService.pushOrderToAddress(orderStateDto);
}
return new FebsResponse().success().message("确认成功");
diff --git a/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java b/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
index 347df5a..43e84a2 100644
--- a/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
+++ b/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
@@ -19,10 +19,14 @@
private String detailAddress;
//取货号
private String takeCode;
+ //团长电话
+ private String leaderPhone;
//金额
private String amount;
//用户openId
private String openId;
+ //备注
+ private String remark;
//订阅消息模版id
private String templateId;
//默认跳到小程序首页
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 4e5ef0f..5b6eacf 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -225,11 +225,11 @@
orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
orderStateMsgVo.setPage(info.getPage());
Map<String, WxTemplateData> m = new HashMap<>(4);
- m.put("phrase1", new WxTemplateData(info.getOrderState()));
- m.put("thing2", new WxTemplateData(info.getAddressArea()));
- m.put("thing3", new WxTemplateData(info.getDetailAddress()));
- m.put("thing6", new WxTemplateData(info.getGoodsName()));
- m.put("character_string11", new WxTemplateData(info.getTakeCode()));
+ m.put("thing4.DATA", new WxTemplateData(info.getAddressArea()));
+ m.put("phone_number14.DATA", new WxTemplateData(info.getLeaderPhone()));
+ m.put("thing3.DATA", new WxTemplateData(info.getGoodsName()));
+ m.put("thing5.DATA", new WxTemplateData(info.getDetailAddress()));
+ m.put("thing15.DATA", new WxTemplateData(info.getRemark()));
orderStateMsgVo.setData(m);
String s = JSONUtil.toJsonStr(orderStateMsgVo);
log.info(s);
--
Gitblit v1.9.1