Merge branch 'feature/自建应用验证' into 'master'

企微订单统计

See merge request !1256

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/fee/HaobanQywxFeeApiServiceImpl.java

@@ -89,11 +89,19 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
 
     @Override
     public void run(String param) {
-        List<TabHaobanWxEnterprise> tabHaobanWxEnterprises = wxEnterpriseService.listAll();
-        for (TabHaobanWxEnterprise wxEnterprise : tabHaobanWxEnterprises) {
-            GicMQClient instance = GICMQClientUtil.getClientInstance();
+        GicMQClient instance = GICMQClientUtil.getClientInstance();
+        if("-1".equals(param)) {
+            List<TabHaobanWxEnterprise> tabHaobanWxEnterprises = wxEnterpriseService.listAll();
+            for (TabHaobanWxEnterprise wxEnterprise : tabHaobanWxEnterprises) {
+                try {
+                    instance.sendMessage("qywxAddFeeMq", wxEnterprise.getWxEnterpriseId());
+                } catch (Exception e) {
+                    logger.info("发送消息处理异常：{}", e.getMessage(), e);
+                }
+            }
+        }else {
             try {
-                instance.sendMessage("qywxAddFeeMq", wxEnterprise.getWxEnterpriseId());
+                instance.sendMessage("qywxAddFeeMq", param);
             } catch (Exception e) {
                 logger.info("发送消息处理异常：{}", e.getMessage(), e);
             }
@@ -161,7 +169,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
         }
         String serviceCorpid = config.getCorpid();
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        if (wxEnterpriseDTO.getWxSecurityType() <= 0 || wxEnterpriseDTO.getWxSecurityType()==5) {
+        if (wxEnterpriseDTO.getWxSecurityType() <= 0) {
             logger.info("WxSecurityType=0/5,wxEnterpriseId={}", wxEnterpriseId);
             return;
         }