Merge remote-tracking branch 'origin/sendMessage' into uat

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -675,10 +675,10 @@ public class AnalysisDiyCustomerComponent {
                 if(!isSync){
                     continue;
                 }
-                *//*人员信息是否被标记删除true：删除，false：未删除*//*
+                *//*人员信息是否被标记删除true：删除，false：未删除*/
                 if(isDelete){
                     continue;
-                }*/
+                }
                 if (userid == null || userid.trim().equals("")) {
                     continue;
                 }
@@ -1221,7 +1221,7 @@ public class AnalysisDiyCustomerComponent {
                 String name = jo.getString("name");
                 String userid = jo.getString("userid");
                 String customerCode = jo.getString("depCode");
-
+                Boolean isDelete = jo.getBoolean("isDelete");
 
                 /*企业微信中成员启用状态。1表示启用的成员，0表示被禁用*/
                 /*if(enable==null||enable.trim().equals("0")){
@@ -1235,10 +1235,10 @@ public class AnalysisDiyCustomerComponent {
                 if(!isSync){
                     continue;
                 }
-                *//*人员信息是否被标记删除true：删除，false：未删除*//*
+                *//*人员信息是否被标记删除true：删除，false：未删除*/
                 if(isDelete){
                     continue;
-                }*/
+                }
                 if(userid==null||userid.trim().equals("")){
                     continue;
                 }
@@ -1397,7 +1397,7 @@ public class AnalysisDiyCustomerComponent {
                 String name = jo.getString("name");
                 String userid = jo.getString("userid");
                 String customerCode = jo.getString("depCode");
-
+                Boolean isDelete = jo.getBoolean("isDelete");
 
                 /*企业微信中成员启用状态。1表示启用的成员，0表示被禁用*/
                 /*if(enable==null||enable.trim().equals("0")){
@@ -1411,10 +1411,10 @@ public class AnalysisDiyCustomerComponent {
                 if(!isSync){
                     continue;
                 }
-                *//*人员信息是否被标记删除true：删除，false：未删除*//*
+                *//*人员信息是否被标记删除true：删除，false：未删除*/
                 if(isDelete){
                     continue;
-                }*/
+                }
                 if(userid==null||userid.trim().equals("")){
                     continue;
                 }
@@ -1595,10 +1595,10 @@ public class AnalysisDiyCustomerComponent {
                 if(!isSync){
                     continue;
                 }
-                *//*人员信息是否被标记删除true：删除，false：未删除*//*
+                *//*人员信息是否被标记删除true：删除，false：未删除*/
                 if(isDelete){
                     continue;
-                }*/
+                }
                 if(userid==null||userid.trim().equals("")){
                     continue;
                 }

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

@@ -661,4 +661,40 @@ public class WxController extends ApiBaseController {
 
     }
 
+    @ApiOperation(value = "系统取消要货通知",
+            notes = "" )
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body")
+    })
+    @PostMapping("sendSystemSelfDeliveryMessage")
+    public Object sendSystemSelfDeliveryMessage() {
+
+        ParameterObject obj = getParameterObject();
+        obj.checkParameterNotNull("chain,order,day");
+        String chain = obj.getString("chain");
+        String order = obj.getString("order");
+        String day = obj.getString("day");
+        String sendType = obj.getString("messageType");
+        String temple="";
+        if("0".equals(sendType)){
+             temple = configService.selectConfigByKey("wx.notification.selfDelivery.systemMessage");
+        }else if("1".equals(sendType)){
+            temple = configService.selectConfigByKey("wx.notification.selfDelivery.sendMessage");
+        }
+        String message = String.format(temple, order,day);
+        //发给经销商
+        Set<String> customerCodes = new HashSet<>();
+        customerCodes.add(chain);
+        logger.info("收到需要通知的经销商组织代码："+chain);
+        Map<String,Map<String,Object>> maps = sysUserService.selectLoginNamesByCostumerCode(customerCodes);
+        //消息
+        if(customerCodes.size()>0){
+            qyWxSendMessageUtil.sendMsgToCustomer(customerCodes,maps,message, "2002");
+        }
+        return AjaxResult.success();
+
+    }
+
+
+
 }