From a80a8b04713f064b9792768d995ffe352833d7de Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 10 九月 2024 17:52:28 +0800
Subject: [PATCH] zjh 2024-09-10
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 31 +++++++++++++++----------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6 +++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 11 +++++++++--
3 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index cab460d..e01b1b9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -1,32 +1,31 @@
package com.ltkj.web.controller.his;
+import com.alibaba.fastjson.JSONObject;
import com.ltkj.common.core.controller.BaseController;
-import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.common.core.page.TableDataInfo;
-import com.ltkj.common.utils.http.HttpUtils;
-import com.ltkj.hosp.domain.DictSsdm;
-import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.hisDto.*;
-import com.ltkj.hosp.service.ITjCustomerService;
-import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
@Api(tags = "AAAAA-----HISAPI鐩稿叧鎺ュ彛鏂囨。")
@RestController
@RequestMapping("/api/His")
public class HisApiController extends BaseController {
+
+
+ @PostMapping(value = "/callback")
+ public void callback(@RequestBody JSONObject json) {
+ System.out.println("===================璁板綍鎵撳嵃娆℃暟====================");
+ System.out.println(json.toJSONString());
+ String tjNumber = json.get("tjNumber").toString();
+ String reportName = json.get("reportName").toString();
+ System.out.println("鐢ㄦ埛: "+tjNumber+reportName+" 宸叉墦鍗�");
+ }
+
+
+
+
// @Autowired
// private ITjCustomerService tjCustomerService;
//
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 2b3d4ca..b00ef3f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1242,6 +1242,7 @@
}
if (StrUtil.isNotBlank(ckfw)) {
try {
+ if (ckfw != null && ckfw.contains("-")) {
Integer.parseInt(tjOrderDetail.getYcbz());
String[] split = ckfw.split("-");
BigDecimal min = new BigDecimal(split[0]);
@@ -1253,8 +1254,9 @@
tjOrderDetail.setYcbz("鈫�");
} else if (jyjgval.compareTo(max) > 0) {
tjOrderDetail.setYcbz("鈫�");
- }
- else {
+ } else if(proResult.contains("闃�")) {
+ tjOrderDetail.setYcbz("");
+ }else {
tjOrderDetail.setYcbz("");
}
if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
@@ -1263,6 +1265,11 @@
}else {
tjOrderDetail.setYcbz("");
}
+ }else {
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("");
+
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
+ }
} catch (NumberFormatException ignored) {
ignored.printStackTrace();
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index eb79a5f..bc26c5f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -893,7 +893,7 @@
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
-
+ TjFlowingWater tjFlowingWater = new TjFlowingWater();
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -958,6 +958,7 @@
tjOrder.setFinishTime(new Date());
tjOrder.setCheckStatus(1);
tjOrder.setStatus(TjConstants.TJ_WAIT);
+ tjFlowingWater.setPayStasus(1L);
}
if (tjOrderService.save(tjOrder)) {
@@ -973,8 +974,7 @@
cusNumber += 1;
tjCustomer.setCusNumber(cusNumber);
BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
- TjFlowingWater tjFlowingWater = new TjFlowingWater();
- tjFlowingWater.setPayStasus(0L);
+
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjFlowingWater.setPayStasus(3L);
--
Gitblit v1.8.0