Commit 433dd5f2 authored by Quxl's avatar Quxl

x

parent f48bb5a1
...@@ -628,12 +628,13 @@ public class UserServiceImpl implements UserService { ...@@ -628,12 +628,13 @@ public class UserServiceImpl implements UserService {
e.printStackTrace(); e.printStackTrace();
} }
if(salesman != null) { if(salesman != null) {
String dateString = DateUtil.format(new Date());
String sCompanyAccountID = (String)salesman.get("sCompanyAccountID"); String sCompanyAccountID = (String)salesman.get("sCompanyAccountID");
if(StringUtil.isNotBlank(sCompanyAccountID)) { if(StringUtil.isNotBlank(sCompanyAccountID)) {
WxMessage wxMessage = new WxMessage(sCompanyAccountID); WxMessage wxMessage = new WxMessage(sCompanyAccountID);
MiniprogramNotice notice = new MiniprogramNotice(); MiniprogramNotice notice = new MiniprogramNotice();
wxMessage.setMiniprogram_notice(notice); wxMessage.setMiniprogram_notice(notice);
notice.setDescription("当前时间"); notice.setDescription(dateString);
notice.setTitle("认证审核通知"); notice.setTitle("认证审核通知");
notice.setPage("pages/customer/customer_detail/customer_detail?SalesmanNO=" + salesmanNO1 + "&isShare=1&custNo=" + custNo + "&shopNo=" + shopNo + ""); notice.setPage("pages/customer/customer_detail/customer_detail?SalesmanNO=" + salesmanNO1 + "&isShare=1&custNo=" + custNo + "&shopNo=" + shopNo + "");
Map<Object, Object> params = new LinkedHashMap<Object, Object>(); Map<Object, Object> params = new LinkedHashMap<Object, Object>();
...@@ -642,7 +643,7 @@ public class UserServiceImpl implements UserService { ...@@ -642,7 +643,7 @@ public class UserServiceImpl implements UserService {
params.put("店铺名称", shopName); params.put("店铺名称", shopName);
params.put("门店规模", storeCount == null ? "0" : String.valueOf(storeCount)); params.put("门店规模", storeCount == null ? "0" : String.valueOf(storeCount));
params.put("地址", address); params.put("地址", address);
params.put("提交时间", DateUtil.format(new Date())); params.put("提交时间", dateString);
params.put("备注", StringUtil.isBlank(memo) ? " " : memo); params.put("备注", StringUtil.isBlank(memo) ? " " : memo);
notice.setContent_item(params); notice.setContent_item(params);
......
...@@ -54,6 +54,7 @@ public class QiyeWxMsgTask { ...@@ -54,6 +54,7 @@ public class QiyeWxMsgTask {
} }
private void sendMessage(Map<String, Object> subOrderMap) { private void sendMessage(Map<String, Object> subOrderMap) {
String dateString = DateUtil.format(new Date());
String sSubOrderID = (String)subOrderMap.get("sSubOrderID"); String sSubOrderID = (String)subOrderMap.get("sSubOrderID");
String sSalesOrderID = (String)subOrderMap.get("sSalesOrderID"); String sSalesOrderID = (String)subOrderMap.get("sSalesOrderID");
TSalesOrder order = jdbcTemplate.queryForBean("select * from tSalesOrder where sSalesOrderID = ?", TSalesOrder.class, sSalesOrderID); TSalesOrder order = jdbcTemplate.queryForBean("select * from tSalesOrder where sSalesOrderID = ?", TSalesOrder.class, sSalesOrderID);
...@@ -73,7 +74,7 @@ public class QiyeWxMsgTask { ...@@ -73,7 +74,7 @@ public class QiyeWxMsgTask {
MiniprogramNotice notice = new MiniprogramNotice(); MiniprogramNotice notice = new MiniprogramNotice();
wxMessage.setMiniprogram_notice(notice); wxMessage.setMiniprogram_notice(notice);
notice.setTitle("客户订单通知知"); notice.setTitle("客户订单通知知");
notice.setDescription("当前时间"); notice.setDescription(dateString);
notice.setPage("pages/ordermanage/detail/detail?SalesmanNO=" + salesmanNo + "&isShare=1&id=" + sSubOrderID + "&isActive=1"); notice.setPage("pages/ordermanage/detail/detail?SalesmanNO=" + salesmanNo + "&isShare=1&id=" + sSubOrderID + "&isActive=1");
Map<Object, Object> params = new LinkedHashMap<Object, Object>(); Map<Object, Object> params = new LinkedHashMap<Object, Object>();
params.put("订单状态", "已发货"); params.put("订单状态", "已发货");
...@@ -81,7 +82,7 @@ public class QiyeWxMsgTask { ...@@ -81,7 +82,7 @@ public class QiyeWxMsgTask {
params.put("订单金额", totalAmount); params.put("订单金额", totalAmount);
params.put("商品数量", totalSaleQty); params.put("商品数量", totalSaleQty);
params.put("支付方式", payType); params.put("支付方式", payType);
params.put("订单时间", DateUtil.format(new Date())); params.put("订单时间", dateString);
params.put("备注", StringUtil.isBlank(shopMemo) ? " " : shopMemo); params.put("备注", StringUtil.isBlank(shopMemo) ? " " : shopMemo);
notice.setContent_item(params); notice.setContent_item(params);
wxService.sendMessage(wxMessage); wxService.sendMessage(wxMessage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment