NPO 冲销处理

mjava-ts/src/main/java/com/malk/taisen/Timers/Time.java

@@ -44,7 +44,9 @@ public class Time {
     @Scheduled(fixedRate = 1000 * 60 * 5)   //05   10   15  25  30   35  40  45  50  55  60
     public void JX() throws Exception {
         System.out.println("每5分钟时查询下NPO流程结束待推送的数据进行处理----开始    QA_sapUrl:" + QA_sapUrl);
-       nonPoServer.NonPoinsetSAP0005list();
+        nonPoServer.NonPoinsetSAP0005list();
+       // nonPoServer.FPGX("cb387014-8cb9-40a4-8462-a7764704e770", "1920000000", "NP6500260002");
+      //  nonPoServer.NPOCX( "18dd8ecb-8605-4a10-8594-b861eba91d5b", "FORM-7E5114C1793141E086D9E0B13F7DFD568AYM");
 
         System.out.println("NPO流程结束待推送的数据-结束");
 

mjava-ts/src/main/java/com/malk/taisen/service/impl/NonPoServerImpl.java

@@ -473,6 +473,8 @@ public class NonPoServerImpl implements NonPoServer {
      * @param InstanceId
      * @param voucherNumber
      */
+    @Value(value = "${hangxing.PROXY_URL}")
+    private String PROXY_URL;
 
     @Override
     public void FPGX(String InstanceId, String voucherNumber, String OAnumber) {
@@ -556,7 +558,6 @@ public class NonPoServerImpl implements NonPoServer {
             List<Map<String, Object>> requestList = Collections.singletonList(request);
             String jsonBody = new ObjectMapper().writeValueAsString(requestList);
             RestTemplate restTemplate = new RestTemplate();
-            String PROXY_URL = "https://poc.cloudpure.cn/api/ts/bookkeeping";
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
             HttpEntity<String> entity = new HttpEntity<>(jsonBody, headers);
@@ -692,8 +693,8 @@ public class NonPoServerImpl implements NonPoServer {
                     body.put("ZOA_TYPE", "NP");
 
                     if (detail.containsKey("textField_mkxd96yz")) {
-                        if (detail.get("textField_mkxd96yz").toString() != "") {
-                            body.put("ZOA_NUMBER", CusutUtil.getFormatDate((long) detail.get("textField_mkxd96yz")));
+                        if (!"".equals(detail.get("textField_mkxd96yz").toString())   && detail.get("textField_mkxd96yz").toString() != null) {
+                            body.put("ZOA_NUMBER",   detail.get("textField_mkxd96yz").toString() );
                         } else {
                             body.put("ZOA_NUMBER", ZOA_NUMBER);
                         }
@@ -717,29 +718,35 @@ public class NonPoServerImpl implements NonPoServer {
 
                     body.put("USNAM", uid);
                     if (detail.containsKey("dateField_mkxd96z1")) {
-                        if (detail.get("dateField_mkxd96z1").toString() != "") {
+                        if (!"".equals(detail.get("dateField_mkxd96z1").toString())) {
                             body.put("BUDAT", CusutUtil.getFormatDate((long) detail.get("dateField_mkxd96z1")));
                         } else {
-                            body.put("BUDAT", "");
+                           // body.put("BUDAT", "");
                         }
-                    }
-                    {
-                        body.put("BUDAT", "");
+                    }else {
+                     //   body.put("BUDAT", "");
                     }
 
 
                     Map result = this._pushSPCX(body);
-                    // prd 重复推送标记成功
-                    if ("S".equals(result.get("E_SYSMSGTYPE")) || "post operation had already been done, repeat is not allowed".equals(result.get("E_MESSAGE"))) {
-                        detail.put("selectField_mkxoe0yk", "成功");
-                        detail.put("textField_mkxd96z2", result.get("E_BELNR"));
-                        detail.put("textField_mkxd96z3", result.get("E_GJAHR"));
-                        succ += 1;
-                    } else {
+                    if (result!=null && result.size()>0){
+                        // prd 重复推送标记成功
+                        if ("S".equals(result.get("E_SYSMSGTYPE")) || "post operation had already been done, repeat is not allowed".equals(result.get("E_MESSAGE"))) {
+                            detail.put("selectField_mkxoe0yk", "成功");
+                            detail.put("textField_mkxd96z2", result.get("E_BELNR"));
+                            detail.put("textField_mkxd96z3", result.get("E_GJAHR"));
+                            succ += 1;
+                        } else {
+                            detail.put("selectField_mkxoe0yk", "失败");
+                            fail += 1;
+                        }
+                        detail.put("textareaField_mkxuo69d", result.get("E_MESSAGE"));
+                    }else {
                         detail.put("selectField_mkxoe0yk", "失败");
+                        detail.put("textareaField_mkxuo69d", "失败，请检查后提交");
                         fail += 1;
                     }
-                    detail.put("textareaField_mkxuo69d", result.get("E_MESSAGE"));
+
 
                 } catch (McException mc) {
                     detail.put("selectField_mkxoe0yk", "失败");
@@ -779,12 +786,20 @@ public class NonPoServerImpl implements NonPoServer {
      */
     private Map _pushSPCX(Map body) {
 
-        log.info("NPO冲销推送 SAP, {}", JSON.toJSONString(body));
-        String rsp = HttpUtil.post(QA_sapUrl + "SAP006", null, JSON.toJSONString(body), null);
-        log.info("NPO冲销 SAP 响应, {}", rsp);
-        List<Map> result = JSON.parseArray(rsp, Map.class);
-        McException.assertAccessException(result.isEmpty(), "Sap接口请求异常, 返回空集合, 需重新推送.");
-        return result.get(0);
+        try {
+            log.info("NPO冲销推送 SAP, {}", JSON.toJSONString(body));
+            String rsp = HttpUtil.post(QA_sapUrl + "SAP006", null, JSON.toJSONString(body), null);
+            log.info("NPO冲销 SAP 响应, {}", rsp);
+            List<Map> result = JSON.parseArray(rsp, Map.class);
+            McException.assertAccessException(result.isEmpty(), "Sap接口请求异常, 返回空集合, 需重新推送.");
+            return result.get(0);
+
+        }catch (Exception e){
+            return  new HashMap<>();
+        }
+
+
+
     }
 
 

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

@@ -61,4 +61,5 @@ sap:
   TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
 
 hangxing:
-  TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
+  TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
+  PROXY_URL:  "https://www.senhouse.cn/apits/bookkeeping"

mjava-ts/src/main/resources/application-prod.yml

@@ -62,4 +62,5 @@ sap:
   TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
 
 hangxing:
-  TARGET_URL_Poc: "http://106.15.251.153:8091/stms/openapi/ts/income/bookkeeping"
+  TARGET_URL_Poc: "http://106.15.251.153:8091/stms/openapi/ts/income/bookkeeping"
+  PROXY_URL:  "https://www.senhouse.cn/apitsprod/bookkeeping"

mjava-ts/src/main/resources/application-test.yml

@@ -61,4 +61,5 @@ sap:
   TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
 
 hangxing:
-  TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
+  TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
+  PROXY_URL:  "https://www.senhouse.cn/apits/bookkeeping"