|
@@ -110,24 +110,25 @@ public class WxController extends ApiBaseController {
|
|
@PostMapping("sendDeliveryMessage")
|
|
@PostMapping("sendDeliveryMessage")
|
|
public Object sendDeliveryMessage(){
|
|
public Object sendDeliveryMessage(){
|
|
ParameterObject obj = getParameterObject();
|
|
ParameterObject obj = getParameterObject();
|
|
- obj.checkParameterNotNull("belongTo,deliveryNumber,shipmentNumber,orderNumber");
|
|
|
|
- String belongTo = obj.getString("belongTo");
|
|
|
|
- String deliveryNumber = obj.getString("deliveryNumber");
|
|
|
|
- String shipmentNumber = obj.getString("shipmentNumber");
|
|
|
|
|
|
+ obj.checkParameterNotNull("orderNumber,tmsShipmentNumber,customerCode,deliveryNumber");
|
|
|
|
+ String pagetitle = obj.getString("pagetitle");
|
|
String orderNumber = obj.getString("orderNumber");
|
|
String orderNumber = obj.getString("orderNumber");
|
|
- String belongToName = obj.getString("belongToName");
|
|
|
|
|
|
+ String tmsShipmentNumber = obj.getString("tmsShipmentNumber");
|
|
|
|
+ String customerCode = obj.getString("customerCode");
|
|
|
|
+ String deliveryNumber = obj.getString("deliveryNumber");
|
|
|
|
+
|
|
logger.info("收到需要通知收货的请求参数:"+obj.toString());
|
|
logger.info("收到需要通知收货的请求参数:"+obj.toString());
|
|
- if(belongToName==null){
|
|
|
|
- belongToName = "经销商";
|
|
|
|
|
|
+ if(pagetitle==null){
|
|
|
|
+ pagetitle = "经销商";
|
|
}
|
|
}
|
|
Set<String> customerCodes = new HashSet<>();
|
|
Set<String> customerCodes = new HashSet<>();
|
|
- customerCodes.add(belongTo);
|
|
|
|
- logger.info("收到需要通知的经销商组织代码:"+belongTo);
|
|
|
|
|
|
+ customerCodes.add(customerCode);
|
|
|
|
+ logger.info("收到需要通知的经销商组织代码:"+customerCode);
|
|
Map<String,Map<String,Object>> maps = sysUserService.selectLoginNamesByCostumerCode(customerCodes);
|
|
Map<String,Map<String,Object>> maps = sysUserService.selectLoginNamesByCostumerCode(customerCodes);
|
|
String temple =configService.selectConfigByKey("wx.notification.delivery");
|
|
String temple =configService.selectConfigByKey("wx.notification.delivery");
|
|
|
|
|
|
//消息
|
|
//消息
|
|
- String message = String.format(temple,deliveryNumber,shipmentNumber,belongTo,orderNumber,belongToName);
|
|
|
|
|
|
+ String message = String.format(temple,pagetitle,orderNumber,tmsShipmentNumber,customerCode,deliveryNumber);
|
|
if(customerCodes.size()>0){
|
|
if(customerCodes.size()>0){
|
|
qyWxSendMessageUtil.sendDeliveryMessage(customerCodes,maps,message);
|
|
qyWxSendMessageUtil.sendDeliveryMessage(customerCodes,maps,message);
|
|
}
|
|
}
|