From 1502f0836f5d2703881e00c500b66a86ed84c989 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 13 六月 2024 16:06:48 +0800
Subject: [PATCH] zjh 本地 2024/06/13 --2

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 6492eac..b0da2bf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -294,7 +294,7 @@
 
     //閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔
     @Transactional
-    public void ZfHisApiMethods(TjCustomer customer, TjOrder order) {
+    public boolean ZfHisApiMethods(TjCustomer customer, TjOrder order) {
         Date dates = new Date();
         final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
 
@@ -305,28 +305,44 @@
 
         String zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
 
-        //浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
+        //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
         AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", jcsqdh);
         String result1 = getAjaxResult(result);
         JSONObject object = getJSONObject(result1);
         String code = object.getStr("ResultCode");
         if (code.equals("0")) {
             orderService.delHuoQuJcsqdh(order.getCardId());
+        }else {
+            return false;
         }
 
-        //浣滃簾闂ㄨ瘖鐢宠
+        //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
         AjaxResult ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", jysqdh);
         String result2 = getAjaxResult(ajaxResult);
         JSONObject object1 = getJSONObject(result2);
         String code1 = object1.getStr("ResultCode");
         if (code1.equals("0")) {
             orderService.delHuoQuJysqdh(order.getCardId());
+        }else {
+            return false;
         }
-
-        controller.Outpinunconapply(order.getCardId(), date, "00029");
-
-        controller.Outpindelmedapply(order.getCardId(), "00029", zlsqdh);
-
+        //2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
+        ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", zlsqdh);
+        result2 = getAjaxResult(ajaxResult);
+        object1 = getJSONObject(result2);
+        code1 = object1.getStr("ResultCode");
+        if (!code1.equals("0")){
+            return false;
+        }
+        //2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
+        ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029");
+        result2 = getAjaxResult(ajaxResult);
+        object1 = getJSONObject(result2);
+        code1 = object1.getStr("ResultCode");
+        if (!code1.equals("0")){
+            return false;
+        }
+        return true;
     }
 
 

--
Gitblit v1.8.0