9.8代码提交

mjava-lilin/pom.xml

@@ -38,11 +38,7 @@
             <artifactId>okhttp</artifactId>
             <version>3.14.9</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>base</artifactId>
@@ -58,6 +54,10 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

mjava-lilin/src/main/java/com/malk/lilin/Controller/taskController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.malk.lilin.Service.LiLinService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
+import com.malk.server.aliwork.YDSearch;
 import com.malk.server.common.McR;
 import com.malk.server.dingtalk.DDConf;
 import com.malk.server.dingtalk.DDR_New;
@@ -13,6 +14,7 @@ import com.malk.service.aliwork.YDClient;
 import com.malk.service.dingtalk.DDClient;
 import com.malk.utils.UtilHttp;
 import com.malk.utils.UtilMap;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +39,7 @@ import java.util.stream.Collectors;
 @Configuration
 @Slf4j
 @ConditionalOnProperty(name = {"enable.scheduling"})
-@RequestMapping("/ll")
+@RequestMapping("/csll")
 public class taskController {
     @Autowired
     private LiLinService lilinService;
@@ -91,7 +93,8 @@ public class taskController {
     }
 
     //    @Scheduled(cron = "0 44 14 * * ?")
-    @Scheduled(fixedRate = 30 * 60 * 1000)
+//    @Scheduled(fixedRate = 30 * 60 * 1000)
+//    @Scheduled(cron = "0 */30 * * * *")
     public void task() {
         log.info("定时获取单笔付款结果开始：{}", LocalDateTime.now());
         try {
@@ -104,7 +107,7 @@ public class taskController {
 
     }
 
-    @Scheduled(fixedRate = 60 * 60 * 1000)
+//    @Scheduled(fixedRate = 60 * 60 * 1000)
     public void taskLS() {
         log.info("定时获取银行流水结果开始：{}", LocalDateTime.now());
         try {
@@ -115,7 +118,7 @@ public class taskController {
         }
     }
 
-    @Scheduled(fixedRate = 30 * 60 * 1000)
+//    @Scheduled(fixedRate = 30 * 60 * 1000)
     public void taskPLJG() {
         log.info("定时获取支付结果发起批量审批开始：{}", LocalDateTime.now());
         try {
@@ -246,54 +249,67 @@ public class taskController {
 
     @PostMapping("/test")
     McR test(@RequestBody Map param) {
-        String formInstanceId = String.valueOf(param.get("formInstanceId"));
-        log.info("formInstanceId:{}", formInstanceId);
-        // 根据实例ID获取表单数据
-        Map data = (Map) ydClient.queryData(YDParam.builder()
-                .formInstId(formInstanceId)
-                .appType(ydConf.getAppType())
-                .systemToken(ydConf.getSystemToken())
-                .userId(ddConf.getOperator())
-                .build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
 
-        if (data == null) {
-            log.warn("formData 为空, formInstanceId:{}", formInstanceId);
-            return McR.errorParam("formData 为空");
-        }
-        String xmdbh = (String) data.get("textField_m25j5gxk");//项目点编号
-        String kpzq = (String) data.get("textField_m25j5gxv");//开票周期
-        String hsxjStr = (String) data.get("numberField_lvdnme0z");//含税小计
-        BigDecimal hsxj = hsxjStr != null && hsxjStr.trim().length() > 0 ? new BigDecimal(hsxjStr) : BigDecimal.ZERO;
-        List<Map> list = (List<Map>) ydClient.queryData(YDParam.builder().formUuid("FORM-97BA6C6C8C50416A9E5854F2F4B5C3F3R4WC")
-                .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_ltxrn8h1", xmdbh)))
+        List<Map> list = (List<Map>) ydClient.queryData(YDParam.builder()
+                .formUuid("FORM-754586D31BF6414586E5C20DB3774A7320CV")
+                .searchFieldJson(JSONObject.toJSONString(Arrays.asList(
+                        new YDSearch("selectField_ma0w9yrb",
+                                Arrays.asList("未审批"),
+                                "SelectField",
+                                YDSearch.Type.RADIO_FIELD,
+                                YDSearch.Operator.CONTAINS)
+                )))
                 .build(), YDConf.FORM_QUERY.retrieve_list_all).getData();
-
-        for (Map<String, Object> item : list) {
-            String formInstanceIdItem = (String) item.get("formInstanceId");
-            Map<String, Object> formData = (Map<String, Object>) item.get("formData");
-            List<Map> tableFieid = (List<Map>) formData.get("tableField_lrru2tnq");
-//            List<Map> updateList = new ArrayList<>();
-            if (tableFieid != null) {
-                for (Map<String, Object> tableItem : tableFieid) {
-                    String zq = (String) tableItem.get("textField_luh0k82j");
-                    if (kpzq.equals(zq)) {
-                        String xjStr = (String) tableItem.get("numberField_lrru2to2");//开票金额保留两位小数
-                        BigDecimal xj = xjStr != null && !xjStr.trim().isEmpty() ? new BigDecimal(xjStr) : BigDecimal.ZERO;
-                        BigDecimal newXj = xj.add(hsxj); // 原金额 + 含税小计
-                        // 保留两位小数，四舍五入
-                        tableItem.put("numberField_lrru2to2", newXj);
-//                        updateList.add(tableItem);
-                    }
-//                    updateList.add(tableItem);
-                }
-            }
-            formData.put("tableField_lrru2tnq", tableFieid);
-            ydClient.operateData(YDParam.builder()
-                    .formInstanceId(formInstanceIdItem)
-                    .updateFormDataJson(JSON.toJSONString(formData))
-                    .build(), YDConf.FORM_OPERATION.update);
-        }
-        return McR.success();
+//        return McR.success(list);
+//        lilinService.taskPLJG();
+//        String formInstanceId = String.valueOf(param.get("formInstanceId"));
+//        log.info("formInstanceId:{}", formInstanceId);
+//        // 根据实例ID获取表单数据
+//        Map data = (Map) ydClient.queryData(YDParam.builder()
+//                .formInstId(formInstanceId)
+//                .appType(ydConf.getAppType())
+//                .systemToken(ydConf.getSystemToken())
+//                .userId(ddConf.getOperator())
+//                .build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
+//
+//        if (data == null) {
+//            log.warn("formData 为空, formInstanceId:{}", formInstanceId);
+//            return McR.errorParam("formData 为空");
+//        }
+//        String xmdbh = (String) data.get("textField_m25j5gxk");//项目点编号
+//        String kpzq = (String) data.get("textField_m25j5gxv");//开票周期
+//        String hsxjStr = (String) data.get("numberField_lvdnme0z");//含税小计
+//        BigDecimal hsxj = hsxjStr != null && hsxjStr.trim().length() > 0 ? new BigDecimal(hsxjStr) : BigDecimal.ZERO;
+//        List<Map> list = (List<Map>) ydClient.queryData(YDParam.builder().formUuid("FORM-97BA6C6C8C50416A9E5854F2F4B5C3F3R4WC")
+//                .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_ltxrn8h1", xmdbh)))
+//                .build(), YDConf.FORM_QUERY.retrieve_list_all).getData();
+//
+//        for (Map<String, Object> item : list) {
+//            String formInstanceIdItem = (String) item.get("formInstanceId");
+//            Map<String, Object> formData = (Map<String, Object>) item.get("formData");
+//            List<Map> tableFieid = (List<Map>) formData.get("tableField_lrru2tnq");
+////            List<Map> updateList = new ArrayList<>();
+//            if (tableFieid != null) {
+//                for (Map<String, Object> tableItem : tableFieid) {
+//                    String zq = (String) tableItem.get("textField_luh0k82j");
+//                    if (kpzq.equals(zq)) {
+//                        String xjStr = (String) tableItem.get("numberField_lrru2to2");//开票金额保留两位小数
+//                        BigDecimal xj = xjStr != null && !xjStr.trim().isEmpty() ? new BigDecimal(xjStr) : BigDecimal.ZERO;
+//                        BigDecimal newXj = xj.add(hsxj); // 原金额 + 含税小计
+//                        // 保留两位小数，四舍五入
+//                        tableItem.put("numberField_lrru2to2", newXj);
+////                        updateList.add(tableItem);
+//                    }
+////                    updateList.add(tableItem);
+//                }
+//            }
+//            formData.put("tableField_lrru2tnq", tableFieid);
+//            ydClient.operateData(YDParam.builder()
+//                    .formInstanceId(formInstanceIdItem)
+//                    .updateFormDataJson(JSON.toJSONString(formData))
+//                    .build(), YDConf.FORM_OPERATION.update);
+//        }
+        return McR.success(list);
     }
 
     @Autowired

mjava-lilin/src/main/java/com/malk/lilin/Service/impl/LiLinServiceImpl.java

@@ -456,6 +456,7 @@ public class LiLinServiceImpl implements LiLinService {
         String fromAccountName = String.valueOf(data.get("textField_m9ze3rj8")); // 付款户名
         String toAccountTypeStr = String.valueOf(data.get("textField_m9ze3rjm")); // 收款类型
         String djlx = String.valueOf(data.get("textField_m9ze3rjr")); // 单据类型
+        String applyDepartment = String.valueOf(data.get("textField_m9ze3rjy")); // 回单邮箱
         String paymentOrderType = djlx.contains("支付宝") ? "alipay" : "common";
 //        Map<String, String> accountMap = new HashMap<>();
 //        accountMap.put("上海韵林礼品有限公司", "1001260509024819590");
@@ -516,6 +517,7 @@ public class LiLinServiceImpl implements LiLinService {
                 mapAll.put("toBank", toBank);
                 mapAll.put("securityCode", securityCode);
                 mapAll.put("metaJson", metaJson);
+                mapAll.put("applyDepartment", applyDepartment);
 
                 // 发起支付
                 String response = UtilHttp.doPost(url, headers, null, null, mapAll);
@@ -564,6 +566,7 @@ public class LiLinServiceImpl implements LiLinService {
             mapAll.put("toBank", toBank);
             mapAll.put("securityCode", securityCode);
             mapAll.put("metaJson", metaJson);
+            mapAll.put("applyDepartment", applyDepartment);
 
             String response = UtilHttp.doPost(url, headers, null, null, mapAll);
             log.info("非物流付款单 - 支付成功 [凭证号: {}, 金额: {}], 响应: {}", instructionId, payAmount, response);
@@ -1222,6 +1225,7 @@ public class LiLinServiceImpl implements LiLinService {
         for (Map item : list) {
             try {
                 String formInstanceId = getStringValue(item, "formInstanceId");
+
                 if (formInstanceId == null || formInstanceId.isEmpty()) {
                     log.warn("跳过：formInstanceId 为空");
                     continue;
@@ -1264,6 +1268,9 @@ public class LiLinServiceImpl implements LiLinService {
                 String note = getStringValue(data, "textField_m9ze3rk3"); // 付款用途
                 String toAccountCode = getStringValue(data, "textField_m9ze3rjs"); // 收款账号
                 String toAccountName = getStringValue(data, "textField_m9ze3rjl"); // 收款户名
+
+                List<String> sqr =UtilMap.getList(data, "employeeField_madmj9kw_id");// 申请人
+                String fklsh = getStringValue(data, "textField_ma13ih7u"); // 付款流程编号
                 String toBank = getStringValue(data, "textField_m9ze3rjr"); // 收款银行支行
                 String fromAccountCode = getStringValue(data, "textField_mdfnuyl9"); // 付款账号
                 String fromAccountName = getStringValue(data, "textField_m9ze3rj8"); // 付款户名
@@ -1294,11 +1301,12 @@ public class LiLinServiceImpl implements LiLinService {
                             tablemap.put("selectField_m9ze3rjf", fklx);
                             tablemap.put("numberField_m9ze3rk4", payAmountStr);
                             tablemap.put("textField_m9ze3rk3", note);
+                            tablemap.put("employeeField_maopzwym", sqr);
                             tablemap.put("textField_m9ze3rjl", toAccountName);
                             tablemap.put("textField_m9ze3rjr", toBank);
                             tablemap.put("textField_m9ze3rjs", toAccountCode);
                             tablemap.put("textField_ma13k7v3", instructionId);
-                            tablemap.put("textField_ma13k7v4", mainInstructionId);
+                            tablemap.put("textField_ma13k7v4", fklsh);
                             tablemap.put("textField_madmzxce", xmbh);
                             updateList.add(tablemap);
                         }
@@ -1313,11 +1321,12 @@ public class LiLinServiceImpl implements LiLinService {
                     tablemap.put("selectField_m9ze3rjf", fklx);
                     tablemap.put("numberField_m9ze3rk4", PayAmount);
                     tablemap.put("textField_m9ze3rk3", note);
+                    tablemap.put("employeeField_maopzwym", sqr);
                     tablemap.put("textField_m9ze3rjl", toAccountName);
                     tablemap.put("textField_m9ze3rjr", toBank);
                     tablemap.put("textField_m9ze3rjs", toAccountCode);
                     tablemap.put("textField_ma13k7v3", instructionId);
-                    tablemap.put("textField_ma13k7v4", mainInstructionId);
+                    tablemap.put("textField_ma13k7v4", fklsh);
                     tablemap.put("textField_madmzxce", xmbh);
                     updateList.add(tablemap);
                 }
@@ -1326,6 +1335,7 @@ public class LiLinServiceImpl implements LiLinService {
                 Map<String, Object> formData = new HashMap<>();
                 formData.put("tableField_ma13k7v1", updateList);
                 formData.put("dateField_me2m2oeu",  zfsj);
+                formData.put("selectField_megv3ask",  "接口创建");
                 formData.put("numberField_mac3ccn8", PayAmount);
                 formData.put("textField_mdsk7rlm", mainInstructionId); // 主流水号用于去重
                 formData.put("employeeField_m8yf6gkl", Arrays.asList("275412081437800471"));

mjava-lilin/src/main/resources/application-dev.yml

@@ -1,14 +1,14 @@
-#测试学习
+
 server:
   port: 9091
   servlet:
     context-path: /lilin
 
 enable:
-  scheduling: false
+  scheduling: true
 logging:
   config: classpath:logback-spring.xml
-  path: /home/server/lilin/log
+  path: /home/server/logs/lilin
   level:
     com.malk.*: info