crm同步代码整理

src/custom/common/crm/bean/core/CrmBase.java

@@ -45,13 +45,6 @@ public abstract class CrmBase extends BaseClass {
         }
     }
 
-    public boolean crm_sync_switch() {
-        try {
-            return Parameter.getBoolean("crm_sync_switch");
-        } catch (Exception e) {
-            return false;
-        }
-    }
 
     public void login() throws YosException {
         try {
@@ -136,16 +129,21 @@ public abstract class CrmBase extends BaseClass {
     //获取crm待同步数据
     public ArrayList<crm_datasync> get(String title, String ownertable, int count) throws YosException {
         ArrayList<crm_datasync> list = new ArrayList<>();
-        if (crm_sync_switch()) {
-            Rows rows = dbConnect.runSqlQuery("select max(id) id,ownerid from crm_datasync where ownertable='" + ownertable + "' and status=0 and count<10 group by ownerid limit " + count);
-            for (Row row : rows) {
-                list.add(new crm_datasync(title, row.getLong("id"), ownertable, row.getLong("ownerid")));
-            }
-            logger.info("监测到有【" + list.size() + "】个【" + title + "】 待同步至CRM");
+        Rows rows = dbConnect.runSqlQuery("select max(id) id,ownerid from crm_datasync where ownertable='" + ownertable + "' and status=0 and count<10 group by ownerid limit " + count);
+        for (Row row : rows) {
+            list.add(new crm_datasync(title, row.getLong("id"), ownertable, row.getLong("ownerid")));
         }
+        logger.info("监测到有【" + list.size() + "】个【" + title + "】 待同步至CRM");
         return list;
     }
 
+    public static boolean crm_sync_switch() {
+        try {
+            return Parameter.getBoolean("crm_sync_switch");
+        } catch (Exception e) {
+            return false;
+        }
+    }
 
     public class crm_datasync {
         public String title;

src/custom/common/crm/crm_get.java

@@ -2,6 +2,7 @@ package common.crm;
 
 import com.alibaba.fastjson2.JSONObject;
 import common.BaseClass;
+import common.crm.bean.core.CrmBase;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Controller;
@@ -20,12 +21,18 @@ public class crm_get extends BaseClass {
     @GetMapping("/getUndeliqty")
     @ResponseBody
     public String getUndeliqty(HttpServletRequest request, HttpServletResponse response, @RequestParam("fagentnum") String fagentnum, @RequestParam("token") String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         return getSuccessResult(new agent(logger).getUndeliqty(fagentnum)).toString();
     }
 
     @GetMapping("/getDRPReceiveBill")
     @ResponseBody
     public String getDRPReceiveBill(HttpServletRequest request, HttpServletResponse response, @RequestParam("fagentnum") String fagentnum, @RequestParam("fbegdate") String fbegdate, @RequestParam("fenddate") String fenddate, @RequestParam("returnMaxCount") String returnMaxCount, @RequestParam("token") String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         int returnMaxCountInt = 30;
         if (fbegdate == null || fbegdate.isEmpty()) {
             return getErrResult("param[fbegdate] is can not null").toString();
@@ -48,6 +55,9 @@ public class crm_get extends BaseClass {
     @GetMapping("/querySaorderList")
     @ResponseBody
     public String querySaorderList(HttpServletRequest request, HttpServletResponse response, @RequestParam("fagentnum") String fagentnum, @RequestParam("fsonums") String[] fsonums, @RequestParam("token") String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         JSONObject successResult = getSuccessResult();
         successResult.put("data", new saorder(logger).querySaorderList(fagentnum, fsonums));
         return successResult.toString();

src/custom/common/crm/crm_pull.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import common.BaseClass;
 import common.YosException;
 import common.YosLogger;
+import common.crm.bean.core.CrmBase;
 import common.crm.bean.item;
 import common.crm.bean.sku;
 import common.crm.bean.warrantycard;
@@ -26,6 +27,9 @@ public class crm_pull extends BaseClass {
     @GetMapping("/pullMachinecodes")
     @ResponseBody
     public String pullMachinecodes(HttpServletRequest request, HttpServletResponse response, @RequestParam("fmachinecodes") String[] fmachinecodes, @RequestParam("token") String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         runTask("CRM请求同步序列号", () -> {
             sku sku = new sku(YosLogger.logger);
             for (String fmachinecode : fmachinecodes) {
@@ -40,6 +44,9 @@ public class crm_pull extends BaseClass {
     @GetMapping("/pullAnyProducts")
     @ResponseBody
     public String pullAnyProducts(HttpServletRequest request, HttpServletResponse response, @RequestParam("fprodNums") String[] fprodNums, @RequestParam("isAllFields") String isAllFields, @RequestParam("token") String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         runTask("CRM请求同步商品档案", () -> {
             item item = new item(YosLogger.logger);
             for (String fprodNum : fprodNums) {
@@ -54,6 +61,9 @@ public class crm_pull extends BaseClass {
     @GetMapping("/pullWarrantycards")
     @ResponseBody
     public String pullWarrantycards(HttpServletRequest request, HttpServletResponse response, @RequestParam("fcustomnum") String fcustomnum, @RequestParam("fmachinecodes") String[] fmachinecodes, @RequestParam("token") String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         runTask("CRM请求同步客户保修卡", () -> {
             try {
                 warrantycard warrantycard = new warrantycard(YosLogger.logger);
@@ -82,4 +92,12 @@ public class crm_pull extends BaseClass {
         object.put("uri", "");
         return object;
     }
+    public JSONObject getErrResult(String msg) {
+        JSONObject object = new JSONObject();
+        object.put("code", 0);
+        object.put("msg", msg);
+        object.put("data", null);
+        object.put("uri", "");
+        return object;
+    }
 }

src/custom/common/crm/crm_put.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import common.YosLogger;
+import common.crm.bean.core.CrmBase;
 import common.crm.bean.icstockbill;
 import common.crm.bean.saorder;
 import common.crm.bean.sku_crm;
@@ -19,6 +20,9 @@ public class crm_put {
     @RequestMapping(value = "/confirmReceiveBill", method = RequestMethod.GET)
     @ResponseBody
     public String confirmReceiveBill(HttpServletRequest request, HttpServletResponse response, @RequestParam("fagentnum") String fagentnum, @RequestParam("fcrmbillnum") String fcrmbillnum, @RequestParam("icstockbillids") String[] icstockbillids, @RequestParam("token") String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         return new icstockbill(YosLogger.logger).confirmReceiveBill(fagentnum, fcrmbillnum, icstockbillids).toString();
     }
 
@@ -26,6 +30,9 @@ public class crm_put {
     @PostMapping
     @ResponseBody
     public String modifyTmachinecodes(HttpServletRequest request, HttpServletResponse response, @RequestBody String body, @RequestParam(value = "token", required = false) String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         JSONArray result = new JSONArray();
         JSONArray jsonArray = JSON.parseArray(body);
         sku_crm skuCrm = new sku_crm(YosLogger.logger);
@@ -43,6 +50,9 @@ public class crm_put {
     @PostMapping
     @ResponseBody
     public String updateDRPWarrantycard(HttpServletRequest request, HttpServletResponse response, @RequestBody String body, @RequestParam(value = "token", required = false) String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         return "";
     }
 
@@ -50,18 +60,20 @@ public class crm_put {
     @PostMapping
     @ResponseBody
     public String insertSaorder(HttpServletRequest request, HttpServletResponse response, @RequestBody String body, @RequestParam(value = "token", required = false) String token) {
+        if (!CrmBase.crm_sync_switch()) {
+            return getErrResult("crm_sync_switch is false").toString();
+        }
         JSONObject jsonObject = JSON.parseObject(body);
         saorder saorder = new saorder(YosLogger.logger);
         return saorder.insertSaorder(jsonObject).toJSONString();
     }
 
-    public JSONObject getSuccessResult() {
+    public JSONObject getErrResult(String msg) {
         JSONObject object = new JSONObject();
-        object.put("code", 1);
-        object.put("msg", "");
-        object.put("data", "");
+        object.put("code", 0);
+        object.put("msg", msg);
+        object.put("data", null);
         object.put("uri", "");
         return object;
     }
-
 }

src/custom/service/CRMDataSync.java

@@ -2,10 +2,15 @@ package service;
 
 import common.ServiceController;
 import common.crm.bean.*;
+import common.crm.bean.core.CrmBase;
 
 public class CRMDataSync extends ServiceController {
     @Override
     public void serviceRun() throws Exception {
+        if (!CrmBase.crm_sync_switch()) {
+            return;
+        }
+
         try {
             new item(logger).autoAction();//更新商品档案至crm
         } catch (Exception e) {