From da583ad2beefb9887dca12a7574ea2d0b853fc9a Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 17 六月 2024 12:39:50 +0800
Subject: [PATCH] zjh 本地 2024/06/17 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 125 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 35a03ec..420fc90 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -28,6 +28,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.core.controller.BaseController;
@@ -143,6 +144,12 @@
// }
// }
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ customerLambdaQueryWrapper.eq(TjCustomer::getCusIdcard, cusIdcard);
+ TjCustomer tjCustomerServiceOne = tjCustomerService.getOne(customerLambdaQueryWrapper);
+ if (null == tjCustomerServiceOne) {
+ return AjaxResult.error("璇ヤ汉鍛樹俊鎭笉瀛樺湪璇峰厛杩涜鐧昏!!!");
+ }
final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
if ("Y".equals(getInfoFromSqlData)) {
//鏍规嵁韬唤璇佸彿浠巋is鏌ヤ俊鎭�
@@ -191,6 +198,51 @@
}
}
+
+ String key = sysConfigService.selectConfigByKey("sfkqdyhis");
+ if (null != key && key.equals("Y")) {
+ String cardId = tjCustomerServiceOne.getCardId();
+ if (null != cardId && !cardId.equals("0")) {
+ int i = tjOrderService.selectTjOrderByCardId(cardId);
+ if (i > 0) {
+ return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+ }
+ }
+
+// controller.Outpincreateapply(tjCustomer);
+
+/* Date dates = new Date();
+ final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+ OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
+ outpinregapplyDto.setPationid(tjCustomerServiceOne.getPationId());
+ outpinregapplyDto.setSqysbm("00029");
+ outpinregapplyDto.setMzksbm("0101");
+ outpinregapplyDto.setCzybm("00029");
+ outpinregapplyDto.setSfjz("0");
+ outpinregapplyDto.setGhzlbm("01");
+ outpinregapplyDto.setYwckbm("0001");
+ outpinregapplyDto.setSflstd("0");
+ outpinregapplyDto.setGhrq(date);
+ //闂ㄨ瘖鎸傚彿
+ AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
+ String result2 = getAjaxResult(ajaxResult);
+ JSONObject object1 = getJSONObject(result2);
+ String code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ JSONArray resultDatas = object1.getJSONArray("ResultData");
+ if (null != resultDatas && resultDatas.size() > 0) {
+ Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
+ String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
+ //闂ㄨ瘖鍖荤敓鎺ヨ瘖
+ controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
+// tjCustomerServiceOne.setCardId(hisRegistrationId);
+// tjCustomerServiceOne.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomerServiceOne.getCusIdcard()),"yyyy-MM-dd"));
+// tjCustomerService.updateById(tjCustomerServiceOne);
+ tjCustomerService.updateCardId(tjCustomerServiceOne.getCusId(),hisRegistrationId);
+ }
+ }*/
+ }
+
//end====2023.12.12
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getIdCard, cusIdcard);
@@ -205,10 +257,43 @@
tjReservationService.updateById(tjReservation);
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}
+
+
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
if (tjCustomer1 != null) {
+ /* String key = sysConfigService.selectConfigByKey("sfkqdyhis");
+ if (null != key && key.equals("Y")) {
+ Date dates = new Date();
+ final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+ OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
+ outpinregapplyDto.setPationid(tjCustomer1.getPationId());
+ outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
+ outpinregapplyDto.setMzksbm("0101");
+ outpinregapplyDto.setCzybm("00029");
+ outpinregapplyDto.setSfjz("0");
+ outpinregapplyDto.setGhzlbm("01");
+ outpinregapplyDto.setYwckbm("0001");
+ outpinregapplyDto.setSflstd("0");
+ outpinregapplyDto.setGhrq(date);
+ //闂ㄨ瘖鎸傚彿
+ AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
+ String result2 = getAjaxResult(ajaxResult);
+ JSONObject object1 = getJSONObject(result2);
+ String code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ JSONArray resultDatas = object1.getJSONArray("ResultData");
+ if (null != resultDatas && resultDatas.size() > 0) {
+ Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
+ String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
+ //闂ㄨ瘖鍖荤敓鎺ヨ瘖
+ controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
+ tjCustomer1.setCardId(hisRegistrationId);
+ }
+ }
+ }*/
+
tjCustomer1.setTjType(tjReservation.getTjType());
tjCustomer1.setCusName(tjReservation.getName());
tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
@@ -263,11 +348,13 @@
tjCustomer.setDiscount(tjReservation.getDiscount());
tjCustomer.setGroupingId(tjReservation.getGroupingId());
return success(tjCustomer);
+ } else {
+ LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+ customerLambdaQueryWrapper1.eq(TjCustomer::getCusIdcard, cusIdcard);
+ TjCustomer one = tjCustomerService.getOne(customerLambdaQueryWrapper1);
+ System.out.println("------------------"+one.getCusBrithday());
+ return AjaxResult.success("鏆傛棤棰勭害淇℃伅", tjCustomerServiceOne);
}
- LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
- qw.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer tjCustomer = tjCustomerService.getOne(qw);
- return AjaxResult.success("鏆傛棤棰勭害淇℃伅", tjCustomer);
}
return error("韬唤璇佸彿涓嶅瓨鍦�");
}
@@ -349,6 +436,7 @@
*/
@PostMapping
@ApiOperation(value = "鏂板瀹㈡埛")
+ @Transactional
public AjaxResult add(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (null == tjCustomer.getCusIdcard() || null == tjCustomer.getCusPhone()) {
return AjaxResult.error("璇疯緭鍏ヨ韩浠借瘉鍙锋垨鎵嬫満鍙�");
@@ -393,16 +481,20 @@
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
// if (tjCustomer.getIdType().equals("1")) {
-// tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
// }
tjCustomer.setCusNumber(0L);
String config = sysConfigService.selectConfigByKey("sfkqdyhis");
- if(null !=config && config.equals("Y")){
+ if (null != config && config.equals("Y")) {
AjaxResult tjCustomer1 = suijieHisXinXi(tjCustomer, date);
if (tjCustomer1 != null) return tjCustomer1;
+ } else {
+ if (tjCustomerService.save(tjCustomer)) {
+ return AjaxResult.success(tjCustomer);
+ }
}
return AjaxResult.error();
-}
+ }
private AjaxResult suijieHisXinXi(TjCustomer tjCustomer, String date) {
AjaxResult result = controller.Outpincreateapply(tjCustomer);
@@ -415,10 +507,11 @@
if (null != resultData && resultData.size() > 0) {
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
- OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
+ tjCustomer.setPationId(pationid);
+ tjCustomerService.updateById(tjCustomer);
+/* OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
outpinregapplyDto.setPationid(pationid);
-// outpinregapplyDto.setHisRegistrationId(pationid);
- outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
+ outpinregapplyDto.setSqysbm("00029");
outpinregapplyDto.setMzksbm("0101");
outpinregapplyDto.setCzybm("00029");
outpinregapplyDto.setSfjz("0");
@@ -438,21 +531,21 @@
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
if (null != hisRegistrationId) {
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
- AjaxResult result3 = controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
+ AjaxResult result3 = controller.Outpinconapply(hisRegistrationId, date,"00029");
String result4 = getAjaxResult(result3);
JSONObject object2 = getJSONObject(result4);
String code2 = object2.getStr("ResultCode");
if (code2.equals("0")) {
Map<String, Object> data = object2.getJSONObject("ResultData");
- String toString = data.get("his_registration_id").toString();
-// tjCustomer.setPationId(pationid);
- tjCustomer.setCardId(toString);
+ String hisRegistrationId1 = data.get("his_registration_id").toString();
+ tjCustomer.setPationId(pationid);
+ tjCustomer.setCardId(hisRegistrationId1);
// tjCustomerService.updateById(tjCustomer);
}
}
}
- }
- }
+ }*/
+ }
}
if (tjCustomerService.save(tjCustomer)) {
--
Gitblit v1.8.0