Merge branch 'master' of https://mc.cloudpure.cn/mjava/cont

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerReferrerServiceImpl.java

@@ -134,7 +134,7 @@ public class KdYdCustomerReferrerServiceImpl extends ServiceImpl<KdYdCustomerRef
             }
 
             String responseBody = response.body();
-            System.out.println("res"+responseBody);
+//            System.out.println("res"+responseBody);
             try {
                 String code = JSON.parseArray(responseBody)
                         .getJSONObject(0)

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerServiceImpl.java

@@ -99,6 +99,7 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
 
             // === 提取主表字段 ===
             String khmc = UtilMap.getString(formData, "textField_lqanqe6j");
+//            String khmc = "26228测试客户11";
             String khbm = UtilMap.getString(formData, "textField_meqhqqvg");
             String xssx = UtilMap.getString(formData, "selectField_megi74y7");
             String khxypj = UtilMap.getString(formData, "selectField_mewirdx4");
@@ -108,6 +109,7 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
             String khfz = UtilMap.getString(formData, "selectField_lqanqe6q");
             String fptt = UtilMap.getString(formData, "textField_llujklkr");
             String nsdjh = UtilMap.getString(formData, "textField_meqhqqvm");
+//            String nsdjh = "121212";
             String khyh = UtilMap.getString(formData, "textField_meqhqqvn");
             String yhzh = UtilMap.getString(formData, "textField_meqhqqvs");
             String jxslx = UtilMap.getString(formData, "selectField_mis6kl56");
@@ -133,7 +135,9 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
             // 构建主表数据
             Map<String, Object> customData = new HashMap<>();
             customData.put("khmc", khmc);
-            customData.put("khbm", khbm);
+            if("edit".equals(action)){
+                customData.put("khbm", khbm);
+            }
             customData.put("xssx", xssx);
             customData.put("khxypj", khxypj);
             customData.put("khsx", khsx);
@@ -200,7 +204,7 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
 // 构建form参数
                 Map<String, Object> formParams = new HashMap<>();
                 formParams.put("jsons", jsonStr);
-                log.info("请求参数：" + formParams);
+                log.info("客户请求参数：" + formParams);
 // 发送请求
                 HttpResponse response = null;
                 if ("add".equals(action)) {
@@ -220,10 +224,10 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
                 String responseBody = response.body();
                 try {
                     // 一行代码提取
-//                    String jdbh = JSON.parseArray(responseBody)
-//                            .getJSONObject(0)
-//                            .getJSONObject("data")
-//                            .getString("djbh");
+                    String khbh = JSON.parseArray(responseBody)
+                            .getJSONObject(0)
+                            .getJSONObject("data")
+                            .getString("djbh");
                     String msg = JSON.parseArray(responseBody)
                             .getJSONObject(0)
                             .getString("msg");
@@ -233,11 +237,11 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
                     ydClient.operateData(
                             YDParam.builder()
                                     .formInstanceId(formInstId)
-                                    .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("textField_ml08nk3y, textareaField_mkxqgrvq", code, msg)))
+                                    .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("textField_ml08nk3y, textareaField_mkxqgrvq, textField_meqhqqvg", code, msg, khbh)))
                                     .useLatestVersion(true).build(),
                             YDConf.FORM_OPERATION.update);
 //
-                    log.info("回写数据到宜搭成功，formInstId: {}", formInstId);
+                    log.info("回写数据到宜搭成功，formInstId: {}，responseBody:{}", formInstId, responseBody);
                 } catch (Exception e) {
                     log.warn("回写数据到宜搭失败，formInstId: {}, 错误: {}", formInstId, e.getMessage());
                 }
@@ -246,7 +250,7 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
             // 构建返回结果
             result.put("data", customData);
 
-            log.info("客户信息同步成功: formInstId={}, khmc={}, khbm={}", formInstId, khmc, khbm);
+            log.info("客户信息同步成功: formInstId={}, khmc={}", formInstId, khmc);
 
         } catch (Exception e) {
             log.error("客户信息同步异常", e);

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryServiceImpl.java

@@ -132,15 +132,16 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             List<Map> tableField = (List<Map>) formData.get("tableField_mejnamfd");
 
             if (tableField != null && !tableField.isEmpty()) {
+                int detailId = 1;
                 for (Map item : tableField) {
                     Map<String, Object> table1Map = new HashMap<>();
-                    int detailId = parseInt(safeGetString(item, "numberField_mjzg06br"), 0);
+//                    int detailId = parseInt(safeGetString(item, "numberField_mjzg06br"), 0);
                     String wlbm = safeGetString(item, "textField_mejnamff");
                     String wlmc = safeGetString(item, "textField_mejnamfg");
                     String ggxh = safeGetString(item, "textField_mejnamfh");
                     String xsdw = safeGetString(item, "textField_mejnamfk");
                     int jjsl = parseInt(safeGetString(item, "numberField_mf6a0h6r"), 0);
-                    int count = parseInt(safeGetString(item, "numberField_mjzg06br"), 0);
+//                    int count = parseInt(safeGetString(item, "numberField_mjzg06br"), 0);
                     String ssxl = safeGetString(item, "textField_mejnamfx");
                     String sfzp = safeGetString(item, "radioField_mf6a0h6h");
                     String ckck = safeGetString(item, "textField_mf6a0h6l");
@@ -159,7 +160,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     table1Map.put("ggxh", ggxh);
                     table1Map.put("xsdw", xsdw);
                     table1Map.put("jjsl", jjsl);
-                    table1Map.put("count", count);
+//                    table1Map.put("count", count);
                     table1Map.put("ssxl", ssxl);
                     table1Map.put("yhrq", yhrq);
                     table1Map.put("sfzp", sfzp);
@@ -173,6 +174,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     table1Map.put("mdh", mdh);
 
                     deliveryList.add(table1Map);
+                    detailId++;
                 }
             }
 
@@ -226,8 +228,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             }
 
             String responseBody = response.body();
-            System.out.println("responseBody===="+responseBody);
-
+            log.info("返回结果responseBody：" + responseBody);
             try {
 
                 String msg = JSON.parseArray(responseBody)

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderServiceImpl.java

@@ -157,7 +157,8 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             String actionType;
             String djbh = null;
             if ("edit".equals(type)) {
-                djbh = UtilMap.getString(formData, "textField_mjs6fuwo");
+//                djbh = UtilMap.getString(formData, "textField_mjs6fuwo");
+                djbh = UtilMap.getString(formData, "textField_miwvnkep");
                 actionType = "edit";
             } else {
                 actionType = "add";
@@ -315,7 +316,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
 // 构建form参数
             Map<String, Object> formParams = new HashMap<>();
             formParams.put("jsons", jsonStr);
-            log.info("请求参数：" + formParams);
+            log.info("订单请求参数：" + formParams);
 // 发送请求
             HttpResponse response = null;
             if ("add".equals(actionType)) {
@@ -333,7 +334,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             }
 
             String responseBody = response.body();
-            log.info("Response Body: " + responseBody);
+            log.info("返回结果responseBody: " + responseBody);
             try {
                 // 一行代码提取
                 String jdbh = JSON.parseArray(responseBody)