Просмотр исходного кода

qxm-修改E签宝UAT为测试appid

qxm 4 лет назад
Родитель
Сommit
9e55173997

+ 6 - 6
suishenbang-api/src/main/resources/application-uat.yml

@@ -110,13 +110,13 @@ esign:
   #  appId: 7438822756
   #  appSecret: fb4f6df1dc934c06e2c84e87e8a3546f
   #  PaaS版
-#  appId: 7438819026
-#  appSecret: 01df3d5154ea1f77fa64c415fb79c52f
-#  serviceUrl: https://smlopenapi.esign.cn
+  appId: 7438819026
+  appSecret: 01df3d5154ea1f77fa64c415fb79c52f
+  serviceUrl: https://smlopenapi.esign.cn
   #  PaaS版正式
-  appId: 5111637536
-  appSecret: ee1321fd61ef055cbfff588085ce0cd2
-  serviceUrl: https://openapi.esign.cn
+#  appId: 5111637536
+#  appSecret: ee1321fd61ef055cbfff588085ce0cd2
+#  serviceUrl: https://openapi.esign.cn
   #  个人认证回调url
   personNotifyUrl: http://suishenbangtest.nipponpaint.com.cn/wxportal-api/eSign/updateUserIsAuthentication
   #  企业认证成功回调url

+ 11 - 10
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -110,24 +110,25 @@ public class WxController extends ApiBaseController {
     @PostMapping("sendDeliveryMessage")
     public Object sendDeliveryMessage(){
         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 belongToName = obj.getString("belongToName");
+        String tmsShipmentNumber = obj.getString("tmsShipmentNumber");
+        String customerCode = obj.getString("customerCode");
+        String deliveryNumber = obj.getString("deliveryNumber");
+
         logger.info("收到需要通知收货的请求参数:"+obj.toString());
-        if(belongToName==null){
-            belongToName = "经销商";
+        if(pagetitle==null){
+            pagetitle = "经销商";
         }
         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);
         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){
             qyWxSendMessageUtil.sendDeliveryMessage(customerCodes,maps,message);
         }