From dedacd79c93f8ef95e0cb986f5e7fbd27ddbd907 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 09:12:49 +0800
Subject: [PATCH] 2025-07-03
---
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 93 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index 5e7b337..13344b5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -7,11 +7,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TjProjectMapper;
import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.controller.system.TjOrderController;
import com.ltkj.web.wxUtils.HttpClientUtils;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -21,9 +24,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -55,6 +56,15 @@
private ITjOrderService orderService;
@Autowired
private TjProjectMapper tjProjectMapper;
+ @Autowired
+ private ISysConfigService sysConfigService;
+ @Autowired
+ private TjOrderController tjOrderController;
+ @Autowired
+ private ISysUserService userService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
+
/**
* 鏀堕��璐瑰洖璋冩帴鍙�
* @param params
@@ -77,6 +87,10 @@
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
if(null !=water){
water.setPayStasus(1L);
+ water.setSfjs("1");
+ water.setJsrq(new Date());
+ water.setJsrxm("his鍥炶皟");
+ water.setJsrdm("999");
if (tjFlowingWaterService.updateById(water)) {
String jxbz = water.getJxbz();
if(StringUtil.isNotBlank(jxbz)){
@@ -94,6 +108,13 @@
// wrapper1.set(TjSampling::getIsPay,1);
// tjSamplingService.update(wrapper1);
}
+ SysUser user = null;
+ if (water.getCreateId()!= null)
+ user = userService.getById(water.getCreateId());
+ else user = userService.getById(1L);
+ TjOrder tjOrder = orderService.getById(water.getOrderId());
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(water.getOrderId());
+ tjOrderController.addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, user, null);
}
}else {
return AjaxResult.error("鏌ヤ笉鍒版祦姘村彿: "+feiYongId);
@@ -106,32 +127,82 @@
if (order != null){
// 閫�璐�
String bldh = water.getJxbz();
- //TODO 鏄惁鍙戦�佷綔搴熺敵璇�
+// lisRevoke(water.getTjNumber(),bldh);
if (bldh != null){
- remarkService.deleteTjOrderDetailByjxbz(bldh);
+ remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),bldh,null);
+ /* remarkService.deleteTjOrderDetailByjxbz(bldh);
tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
transitionService.deleteTjOrderDetailByjxbz(bldh);
blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, order.getTjNumber()).eq(TjProBl::getBldh, bldh));
- tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);*/
}else {
- tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ /* TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+ tjOrderService.removeById(order.getOrderId());*/
+ /* tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
+ ycxmService.delOrderYcXmJyByTjh(order.getTjNumber());
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- customer.setCardId("0");
- tjCustomerService.updateById(customer);
- tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),null);
+
+
}
+ water.setPayStasus(2L);
+ water.setRefundPersonId("his鍥炶皟");
+ water.setRefundTime(new Date());
+ water.setRefundPrice(water.getPaidIn());
+ tjFlowingWaterService.updateById(water);
}
}
}
return AjaxResult.success();
}
+ private void lisRevoke(String tjNum,String jxbz){
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getTjNum,tjNum);
+ if (StrUtil.isNotBlank(jxbz))
+ wrapper.eq(TjSampling::getJxbz,jxbz);
+ List<TjSampling> list = tjSamplingMapper.selectList(wrapper);
+ List<TjSampling> isMergeList = list.stream().filter(i -> i.getIsMerge() == 1).collect(Collectors.toList());
+ JSONArray array = JSONUtil.createArray();
+ for (TjSampling sampling : isMergeList) {
+ String[] proIds = sampling.getProId().split(",");
+ for (String proId : proIds) {
+ JSONObject object = JSONUtil.createObj();
+ TjProject project = tjProjectMapper.selectById(proId);
+ object.putOpt("txm",sampling.getJyxh());
+ object.putOpt("sfxmid",project.getProId());
+ object.putOpt("sfxmname",project.getProName());
+ object.putOpt("primaryKey",proId);
+ array.add(object);
+ }
+ list = list.stream().filter(i -> !i.getProId().equals(sampling.getProId())).collect(Collectors.toList());
+ }
+ for (TjSampling sampling : list) {
+ String proId = sampling.getProId();
+ JSONObject object = JSONUtil.createObj();
+ TjProject project = tjProjectMapper.selectById(proId);
+ object.putOpt("txm",sampling.getJyxh());
+ object.putOpt("sfxmid",project.getProId());
+ object.putOpt("sfxmname",project.getProName());
+ object.putOpt("primaryKey",proId);
+ array.add(object);
+ }
+ String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
+ String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("list",array);
+ String post = HttpClientUtils.sendPost(apiUrl + "/api/lis/"+ hospbm +"/revoke", hashMap);
+
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑His瀛楀吀闆嗗悎
* @param params
--
Gitblit v1.8.0