From 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 23 一月 2025 17:07:51 +0800
Subject: [PATCH] zjh20250123
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 296 +++++++++++++++++++++++++++++------------------------------
1 files changed, 145 insertions(+), 151 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 1706951..0d5da1a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -34,6 +34,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -234,76 +235,76 @@
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
- if(order.getFinishTime() !=null){
+ if (order.getFinishTime() != null) {
return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
}
TjCustomer customer = customerService.getById(order.getUserId());
if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
- tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() +SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() + SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setIsAddition("Y");
- if(tjFlowingWater.getPayStasus().toString().equals("0")){
+ if (tjFlowingWater.getPayStasus().toString().equals("0")) {
tjFlowingWater.setPayStasus(0L);
- }else {
+ } else {
tjFlowingWater.setPayStasus(1L);
}
if (tjFlowingWaterService.save(tjFlowingWater)) {
Date dates = new Date();
- String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();
+ String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss") + order.getOrderId();
//寮傛鍗曢」鏀惰垂鏄庣粏
- Boolean b = asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser,jxbz);
- if (!b){
+ Boolean b = asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser, jxbz);
+ if (!b) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
}
- if(tjFlowingWater.getPayStasus().equals(1L)){
+ if (tjFlowingWater.getPayStasus().equals(1L)) {
detailService.updateTjOrderDetailsFlowingWaterIdByJxbz(order.getOrderId().toString(), jxbz, tjFlowingWater.getTjSerialNumber().toString());
remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(), jxbz, tjFlowingWater.getTjSerialNumber().toString());
- }else {
+ } else {
String s = configService.selectConfigByKey("is_request_common_his_api");
if (null != s && s.equals("Y")) {
String apiUrl = configService.selectConfigByKey("common_api_url");
String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
HashMap<String, Object> map = new HashMap<>();
- map.put("pationId",customer.getPationId());
- map.put("cardId",customer.getHisJzkh());
- map.put("tjNum",tjFlowingWater.getTjSerialNumber());
- map.put("kaiDanKs","7805");
+ map.put("pationId", customer.getPationId());
+ map.put("cardId", customer.getHisJzkh());
+ map.put("tjNum", tjFlowingWater.getTjSerialNumber());
+ map.put("kaiDanKs", "7805");
// 鏀惰垂鏍囧織 1寰呭敭璐� 2寰呴��璐�
- map.put("shouTuiStatus","1");
+ map.put("shouTuiStatus", "1");
JSONArray array = JSONUtil.createArray();
LambdaQueryWrapper<TbTransition> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TbTransition::getTjNum,order.getTjNumber());
- wrapper.eq(TbTransition::getCusId,customer.getCusIdcard());
- wrapper.eq(TbTransition::getCardId,customer.getCardId());
- wrapper.eq(TbTransition::getJxbz,jxbz);
- wrapper.isNotNull(TbTransition::getOrdPrice);
- wrapper.gt(TbTransition::getOrdPrice,0);
+ wrapper.eq(TbTransition::getTjNum, order.getTjNumber());
+ wrapper.eq(TbTransition::getCusId, customer.getCusIdcard());
+ wrapper.eq(TbTransition::getCardId, customer.getCardId());
+ wrapper.eq(TbTransition::getJxbz, jxbz);
+ wrapper.isNotNull(TbTransition::getNowPrice);
+ wrapper.gt(TbTransition::getNowPrice, 0);
List<TbTransition> list = transitionService.list(wrapper);
for (TbTransition transition : list) {
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjProject::getProId,transition.getProId());
+ wrapper1.eq(TjProject::getProId, transition.getProId());
TjProject project = projectService.getOne(wrapper1);
LambdaQueryWrapper<SysDept> wrapper2 = new LambdaQueryWrapper<>();
- wrapper2.eq(SysDept::getDeptId,project.getDeptId());
+ wrapper2.eq(SysDept::getDeptId, project.getDeptId());
SysDept dept = sysDeptService.getOne(wrapper2);
JSONObject obj = JSONUtil.createObj();
- BigDecimal danjia = transition.getOrdPrice();
+ BigDecimal danjia = transition.getNowPrice();
Integer sl = project.getSl();
BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
- obj.putOpt("danJia",danjia);
- obj.putOpt("jieSuanJe",allPrice);
- obj.putOpt("shuliang",sl);
- obj.putOpt("zhiXingKs",dept.getDeptId());
- obj.putOpt("zhiXingKsMc",dept.getDeptName());
- obj.putOpt("shouFeiXmId",project.getHisXmbm());
- obj.putOpt("shouFeiXmMc",project.getHisXmmc());
+ obj.putOpt("danJia", danjia);
+ obj.putOpt("jieSuanJe", allPrice);
+ obj.putOpt("shuliang", sl);
+ obj.putOpt("zhiXingKs", dept.getDeptId());
+ obj.putOpt("zhiXingKsMc", dept.getDeptName());
+ obj.putOpt("shouFeiXmId", project.getHisXmbm());
+ obj.putOpt("shouFeiXmMc", project.getHisXmmc());
// obj.putOpt("zhiXingKs","7805");
// obj.putOpt("zhiXingKsMc","浣撴绉�");
@@ -311,9 +312,9 @@
// obj.putOpt("shouFeiXmMc","浣撴璐�");
array.add(obj);
}
- map.put("feiYongInfoList",array);
+ map.put("feiYongInfoList", array);
- String post = HttpClientUtils.sendPost(apiUrl + "/api/his/"+hospbm+"/creatCostInfo", map);
+ String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
JSONObject object = JSONUtil.parseObj(post);
if (object.getInt("code") == 200) {
JSONObject data = object.getJSONObject("data");
@@ -324,7 +325,7 @@
tjFlowingWaterHisService.saveBatch(his);
}
tjFlowingWaterService.updateById(tjFlowingWater);
- }else {
+ } else {
return AjaxResult.error();
}
}
@@ -348,8 +349,8 @@
// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
// detailService.updateById(tjOrderDetail);
// }
- detailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String.valueOf(order.getOrderId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
+ detailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String.valueOf(order.getOrderId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
LambdaQueryWrapper<TjOrderDetail> wq3 = new LambdaQueryWrapper<>();
wq3.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId());
wq3.isNotNull(TjOrderDetail::getFlowingWaterId);
@@ -430,10 +431,10 @@
// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
// detailService.updateById(tjOrderDetail);
// }
- if (StrUtil.isBlank(flowingWater.getJxbz())){
- detailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String.valueOf(order.getOrderId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
- }else {
+ if (StrUtil.isBlank(flowingWater.getJxbz())) {
+ detailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String.valueOf(order.getOrderId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ } else {
detailService.updateTjOrderDetailsFlowingWaterIdByJxbz(String.valueOf(order.getOrderId()), flowingWater.getJxbz(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(), flowingWater.getJxbz(), tjFlowingWater.getTjSerialNumber().toString());
}
@@ -456,7 +457,7 @@
map.put("mobanId", reportService.getMoBanIds());
SysUser user = null;
- if (flowingWater.getCreateId()!= null)
+ if (flowingWater.getCreateId() != null)
user = userService.getById(flowingWater.getCreateId());
else user = userService.getById(1L);
TjOrder tjOrder = orderService.getById(flowingWater.getOrderId());
@@ -474,39 +475,39 @@
@ApiOperation(value = "浣撴鐐瑰嚮寮哄埗閫�璐规寜閽帴鍙�")
@Transactional
@RepeatSubmit
- public AjaxResult refundEdit(@RequestBody String json){
+ public AjaxResult refundEdit(@RequestBody String json) {
JSONObject parseObj = JSONUtil.parseObj(json);
String tjSerialNumber = parseObj.getStr("tjSerialNumber");
TjFlowingWater tjFlowingWater = tjFlowingWaterService.getById(tjSerialNumber);
Long orderId = tjFlowingWater.getOrderId();
LambdaQueryWrapper<TjOrderRemark> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrderRemark::getSfbz,tjSerialNumber);
+ wrapper.eq(TjOrderRemark::getSfbz, tjSerialNumber);
List<TjOrderRemark> list = remarkService.list(wrapper);
- if (list.isEmpty()){
+ if (list.isEmpty()) {
return AjaxResult.error("璇ヤ汉鍛樻病鏈夊凡鏀惰垂椤圭洰");
}
String tjNumber = list.get(0).getTjNumber();
List<Long> proIds = list.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
LambdaQueryWrapper<TjSampling> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjSampling::getTjNum,tjNumber);
- wrapper1.in(TjSampling::getProId,proIds);
- wrapper1.eq(TjSampling::getIsSignFor,"0");
+ wrapper1.eq(TjSampling::getTjNum, tjNumber);
+ wrapper1.in(TjSampling::getProId, proIds);
+ wrapper1.eq(TjSampling::getIsSignFor, "0");
List<TjSampling> samplings = tjSamplingService.list(wrapper1);
if (!samplings.isEmpty())
return AjaxResult.error("璇ヤ汉鍛樻鍗曚腑瀛樺湪宸插仛鐨勫寲楠岄」鐩�,涓嶅彲閫�璐�");
- if (StrUtil.isBlank(tjFlowingWater.getJxbz())){
+ if (StrUtil.isBlank(tjFlowingWater.getJxbz())) {
LambdaUpdateWrapper<TjOrderDetail> wrapper2 = new LambdaUpdateWrapper<>();
- wrapper2.set(TjOrderDetail::getFlowingWaterId,null)
- .set(TjOrderDetail::getUpdateTime,new Date())
- .eq(TjOrderDetail::getOrderId,orderId)
+ wrapper2.set(TjOrderDetail::getFlowingWaterId, null)
+ .set(TjOrderDetail::getUpdateTime, new Date())
+ .eq(TjOrderDetail::getOrderId, orderId)
.isNull(TjOrderDetail::getJxbz);
detailService.update(wrapper2);
LambdaUpdateWrapper<TjOrderRemark> wrapper3 = new LambdaUpdateWrapper<>();
// wrapper3
- }else {
+ } else {
// detailService.updateTjOrderDetailsFlowingWaterIdByJxbz(String.valueOf(order.getOrderId()), flowingWater.getJxbz(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
// remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(), flowingWater.getJxbz(), tjFlowingWater.getTjSerialNumber().toString());
}
@@ -646,8 +647,8 @@
@GetMapping("/findTjRefundListByNameAndTjNumAndPhone2")
@ApiOperation(value = "浣撴(閫�璐�)椤甸潰鏌ヨ鎺ュ彛")
public AjaxResult findTjRefundListByNameAndTjNumAndPhone2(@RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNum,
- @RequestParam(required = false) @ApiParam(value = "浣撴浜哄鍚�") String tjName,
- @RequestParam(required = false) @ApiParam(value = "浣撴浜烘墜鏈哄彿") String tjPhone) {
+ @RequestParam(required = false) @ApiParam(value = "浣撴浜哄鍚�") String tjName,
+ @RequestParam(required = false) @ApiParam(value = "浣撴浜烘墜鏈哄彿") String tjPhone) {
if (null != tjName || null != tjPhone) {
LambdaQueryWrapper<TjCustomer> wq0 = new LambdaQueryWrapper<>();
@@ -672,7 +673,7 @@
}
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjFlowingWater::getOrderId, order.getOrderId());
- wrapper.eq(TjFlowingWater::getPayStasus,1L);
+ wrapper.eq(TjFlowingWater::getPayStasus, 1L);
List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper);
for (TjFlowingWater water : list) {
TjRefundVo tjRefundVo = new TjRefundVo();
@@ -705,7 +706,7 @@
for (TjOrder order : orderList) {
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjFlowingWater::getOrderId, order.getOrderId());
- wrapper.eq(TjFlowingWater::getPayStasus,1L);
+ wrapper.eq(TjFlowingWater::getPayStasus, 1L);
List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper);
TjCustomer customer = customerService.getById(order.getUserId());
for (TjFlowingWater water : list) {
@@ -843,8 +844,8 @@
@GetMapping("/findTjCollectFeesByNameAndTjNumAndPhoneN")
@ApiOperation(value = "浣撴(鏀惰垂)椤甸潰鏌ヨ鎺ュ彛")
public AjaxResult findTjCollectFeesByNameAndTjNumAndPhoneNew(@RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNum,
- @RequestParam(required = false) @ApiParam(value = "浣撴浜哄鍚�") String tjName,
- @RequestParam(required = false) @ApiParam(value = "浣撴浜烘墜鏈哄彿") String tjPhone) {
+ @RequestParam(required = false) @ApiParam(value = "浣撴浜哄鍚�") String tjName,
+ @RequestParam(required = false) @ApiParam(value = "浣撴浜烘墜鏈哄彿") String tjPhone) {
List<TjCollectFeesVo> tjCollectFeesVoList = new ArrayList<>();
if (null != tjName || null != tjPhone) {
LambdaQueryWrapper<TjCustomer> wq0 = new LambdaQueryWrapper<>();
@@ -853,48 +854,32 @@
.like(TjCustomer::getCusPhone, tjPhone);
List<TjCustomer> customerList = customerService.list(wq0);
if (null != customerList && !customerList.isEmpty()) {
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.in(TjOrder::getUserId,customerList.stream().map(TjCustomer::getCusId).collect(Collectors.toList()));
- wq1.eq(TjOrder::getCheckStatus, 0);
-// wq1.isNotNull(TjOrder::getReportTime);
- wq1.orderByDesc(TjOrder::getCreateTime);
- List<TjOrder> tjOrders = orderService.list(wq1);
- if (null != tjOrders && !tjOrders.isEmpty()) {
- for (TjOrder order : tjOrders) {
- TjCustomer customer = customerService.getById(order.getUserId());
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
- List<TjOrderDetail> detailList = detailService.list(wq2);
- if (null != detailList && !detailList.isEmpty()) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.in(TjOrder::getUserId, customerList.stream().map(TjCustomer::getCusId).collect(Collectors.toList()));
+ List<TjOrder> tjOrders = orderService.list(wq1);
+ if (null != tjOrders && !tjOrders.isEmpty()) {
+ for (TjOrder order : tjOrders) {
+ LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjFlowingWater::getOrderId, order.getOrderId());
+ List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
+ for (TjFlowingWater water : list) {
+ TjCustomer customer = customerService.getById(order.getUserId());
TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
+ tjRefundVo.setTjType(order.getTjType());
tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
tjRefundVo.setTjName(customer.getCusName());
tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- if (null != customer.getCusIdcard()) tjRefundVo.setIdCard(customer.getCusIdcard());
- DictComp dictComp = compService.getById(order.getFirmId());
- if (null != dictComp) {
- tjRefundVo.setTjComp(dictComp.getCnName());
- } else {
- tjRefundVo.setTjComp("鏃�");
- }
- if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
- LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>();
- wq.eq(TjFlowingWater::getOrderId, order.getOrderId());
-// wq.eq(TjFlowingWater::getIsAddition, "N");
- wq.ne(TjFlowingWater::getPayStasus, 2);
-
- List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
- for (TjFlowingWater water : list) {
- tjRefundVo.setTjFlowingWater(water);
- tjRefundVo.setTjNumber(order.getTjNumber());
- tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
- TjCollectFeesVo vo = BeanUtil.copyProperties(tjRefundVo, TjCollectFeesVo.class);
- tjCollectFeesVoList.add(vo);
- }
+ tjRefundVo.setIdCard(customer.getCusIdcard());
+ tjRefundVo.setTjComp(order.getFirmName());
+ tjRefundVo.setTjFlowingWater(water);
+ tjRefundVo.setTjNumber(order.getTjNumber());
+ tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
+ tjCollectFeesVoList.add(tjRefundVo);
}
- }
+
}
+ }
return AjaxResult.success(tjCollectFeesVoList);
}
@@ -904,40 +889,30 @@
if (null != tjNum) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.likeLeft(TjOrder::getTjNumber, tjNum);
-// wq1.eq(TjOrder::getCheckStatus, 0);
List<TjOrder> orderList = orderService.list(wq1);
if (null != orderList && !orderList.isEmpty()) {
for (TjOrder order : orderList) {
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
- //wq2.isNull(TjOrderDetail::getFlowingWaterId);
- List<TjOrderDetail> detailList = detailService.list(wq2);
- if (null != detailList && !detailList.isEmpty()) {
+ LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjFlowingWater::getOrderId, order.getOrderId());
+ List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
+ for (TjFlowingWater water : list) {
TjCustomer customer = customerService.getById(order.getUserId());
- if (null != customer) {
- TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
- tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
- tjRefundVo.setTjName(customer.getCusName());
- tjRefundVo.setTjPhone(customer.getCusPhone());
- tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- tjRefundVo.setIdCard(customer.getCusIdcard());
- if (null != order.getFirmId()) {
- DictComp byId = compService.getById(order.getFirmId());
- if (null != byId) {
- tjRefundVo.setTjComp(byId.getCnName());
- }
- }
- if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
- TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
- .eq(TjFlowingWater::getOrderId, order.getOrderId())
- .eq(TjFlowingWater::getIsAddition, "N")
- .ne(TjFlowingWater::getPayStasus, 2));
- tjRefundVo.setTjFlowingWater(one);
- tjRefundVo.setTjNumber(order.getTjNumber());
- tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
- tjCollectFeesVoList.add(tjRefundVo);
- }
+ TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
+ tjRefundVo.setTjType(order.getTjType());
+ tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
+ tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
+ tjRefundVo.setIdCard(customer.getCusIdcard());
+ tjRefundVo.setTjComp(order.getFirmName());
+ tjRefundVo.setTjFlowingWater(water);
+ tjRefundVo.setTjNumber(order.getTjNumber());
+ tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
+// TjCollectFeesVo vo = BeanUtil.copyProperties(tjRefundVo, TjCollectFeesVo.class);
+ tjCollectFeesVoList.add(tjRefundVo);
}
+
+
}
return AjaxResult.success(tjCollectFeesVoList);
}
@@ -963,7 +938,7 @@
} else {
tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId);
}
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId());
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(), order.getCardId());
String s = tjFlowingWaterService.getDiscount(OrderId);
if (null != tjProjectList && !tjProjectList.isEmpty()) {
for (TjProject project : tjProjectList) {
@@ -990,9 +965,9 @@
.eq(TjFlowingWater::getPayStasus, 2));
if (null != list && !list.isEmpty()) {
List<TjProject> projectList = projectService.getTjProListByPacIdAndDeptId(pacId);
- if(null !=projectList && !projectList.isEmpty()){
+ if (null != projectList && !projectList.isEmpty()) {
for (TjProject project : projectList) {
- project.setProOrdPrice(tjPackageProjectService.getPacProPriceByPacIdAndPro(project.getProId(),pacId)
+ project.setProOrdPrice(tjPackageProjectService.getPacProPriceByPacIdAndPro(project.getProId(), pacId)
.multiply(new BigDecimal(s)).setScale(2));
tjProjectList.add(project);
}
@@ -1012,29 +987,35 @@
@GetMapping("/findTjChargedButNotChargedByTjNumN")
@ApiOperation(value = "浣撴宸叉敹璐规湭鏀惰垂淇℃伅鏌ヨ鎺ュ彛")
public AjaxResult findTjChargedButNotChargedByTjNumN(@RequestParam @ApiParam(value = "0鏈即璐�1宸茬即璐�") Integer type,
- @RequestParam @ApiParam(value = "浣撴鍙�") String OrderId,
+ @RequestParam @ApiParam(value = "浣撴鍙�") String OrderId,
@RequestParam String tjSerialNumber) {
- if (null != OrderId) {
+ if (StringUtil.isNotBlank(OrderId)) {
TjOrder order = orderService.getById(OrderId);
if (null != order) {
- List<TjProject> tjProjectList = null;
+ List<TjProject> tjProjectList = new ArrayList<>();
+ List<TjOrderRemark> remarkList = null;
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjFlowingWater::getTjSerialNumber,tjSerialNumber);
+ wrapper.eq(TjFlowingWater::getTjSerialNumber, tjSerialNumber);
// wrapper.eq(TjFlowingWater::getPayStasus,type);
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
if (water == null)
return AjaxResult.success(tjProjectList);
if (type == 0) {
if (StrUtil.isBlank(water.getJxbz()))
- tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNullAndJxbzIsNull(OrderId);
- else tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNullN(OrderId,water.getJxbz());
+// tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNullAndJxbzIsNull(OrderId);
+ remarkList = remarkService.shoufeiyemianweishoufei(order.getTjNumber(), null);
+// else tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNullN(OrderId,water.getJxbz());
+ else remarkList = remarkService.shoufeiyemianweishoufei(order.getTjNumber(), water.getJxbz());
} else {
if (StrUtil.isBlank(water.getJxbz()))
- tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNullAndJxbzIsNull(OrderId);
- else tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNullN(OrderId,water.getJxbz());
+// tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNullAndJxbzIsNull(OrderId);
+ remarkList = remarkService.shoufeiyemianyishoufei(order.getTjNumber(), null);
+// else tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNullN(OrderId,water.getJxbz());
+ else remarkList = remarkService.shoufeiyemianyishoufei(order.getTjNumber(), water.getJxbz());
}
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId());
- String s = tjFlowingWaterService.getDiscount(OrderId);
+// String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId());
+// String s = tjFlowingWaterService.getDiscount(OrderId);
+/*
if (null != tjProjectList && !tjProjectList.isEmpty()) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
@@ -1045,12 +1026,12 @@
project.setProPrice(pp.getPriceNow());
project.setProOrdPrice(pp.getPriceNow().multiply(new BigDecimal(s)));
} else {
- project.setProPrice(project.getProPrice().setScale(2));
- project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)).setScale(2));
+ project.setProPrice(project.getProPrice());
+ project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)));
}
} else {
- project.setProPrice(project.getProPrice().setScale(2));
- project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)).setScale(2));
+ project.setProPrice(project.getProPrice());
+ project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)));
}
}
}
@@ -1063,12 +1044,25 @@
if(null !=projectList && !projectList.isEmpty()){
for (TjProject project : projectList) {
project.setProOrdPrice(tjPackageProjectService.getPacProPriceByPacIdAndPro(project.getProId(),pacId)
- .multiply(new BigDecimal(s)).setScale(2));
+ .multiply(new BigDecimal(s)));
tjProjectList.add(project);
}
}
}
+ }
+*/
+
+ if (!remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ TjProject tjProject = projectService.getById(remark.getProId());
+ BigDecimal newdecimal = transitionService.getTbTransitionNewPriceByTjNumAndParentId(remark.getTjNumber(), remark.getProId().toString());
+ BigDecimal orddecimal = transitionService.getTbTransitionOrdPriceByTjNumAndParentId(remark.getTjNumber(), remark.getProId().toString());
+ tjProject.setProOrdPrice(orddecimal);
+ tjProject.setProPrice(newdecimal);
+ tjProjectList.add(tjProject);
+ }
+
}
return AjaxResult.success(tjProjectList);
}
@@ -1095,8 +1089,8 @@
wq.ne(TjOrderDetail::getTjStatus, 3);
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq);
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber(),tjOrder.getCardId());
- if (null != detailList && detailList.size() > 0) {
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber(), tjOrder.getCardId());
+ if (null != detailList && !detailList.isEmpty()) {
List<TjRefundProInfoVo> tjRefundProInfoVoList = new ArrayList<>();
for (TjOrderDetail detail : detailList) {
TjProject project = projectService.getById(detail.getProId());
@@ -1156,16 +1150,16 @@
if (tjOrder.getCheckStatus() == 0 && tjOrder.getReportTime() == null) {
List<TjRefundProInfoVo> tjRefundProInfoVoList = new ArrayList<>();
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
- wrapper.eq(TjFlowingWater::getPayStasus,1L);
+ wrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
+ wrapper.eq(TjFlowingWater::getPayStasus, 1L);
List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper);
if (list.isEmpty())
return AjaxResult.error("娌℃湁鏀惰垂椤圭洰");
for (TjFlowingWater water : list) {
LambdaQueryWrapper<TjOrderRemark> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjOrderRemark::getTjNumber,tjOrder.getTjNumber());
+ wrapper1.eq(TjOrderRemark::getTjNumber, tjOrder.getTjNumber());
if (StrUtil.isNotBlank(water.getJxbz()))
- wrapper1.eq(TjOrderRemark::getJxbz,water.getJxbz());
+ wrapper1.eq(TjOrderRemark::getJxbz, water.getJxbz());
else wrapper1.isNull(TjOrderRemark::getJxbz);
wrapper1.isNotNull(TjOrderRemark::getSfbz);
List<TjOrderRemark> list1 = remarkService.list(wrapper1);
@@ -1173,8 +1167,8 @@
TjProject project = projectService.getById(remark.getProId());
QueryWrapper<TbTransition> wrapper2 = new QueryWrapper<>();
wrapper2.select("sum(now_price) as now_price");
- wrapper2.eq("tj_num",remark.getTjNumber());
- wrapper2.eq("parent_pro_id",remark.getProId());
+ wrapper2.eq("tj_num", remark.getTjNumber());
+ wrapper2.eq("parent_pro_id", remark.getProId());
wrapper2.groupBy("parent_pro_id");
TbTransition transition = tbTransitionService.getOne(wrapper2);
TjRefundProInfoVo proInfoVo = new TjRefundProInfoVo();
@@ -1288,9 +1282,9 @@
List<TjProject> refundPros = tjFlowingWater.getRefundPros();
List<Long> proIds = refundPros.stream().map(TjProject::getProId).collect(Collectors.toList());
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.in(TjSampling::getProId,proIds);
- wrapper.eq(TjSampling::getTjNum,order.getTjNumber());
- wrapper.eq(TjSampling::getIsSignFor,"0");
+ wrapper.in(TjSampling::getProId, proIds);
+ wrapper.eq(TjSampling::getTjNum, order.getTjNumber());
+ wrapper.eq(TjSampling::getIsSignFor, "0");
List<TjSampling> list1 = tjSamplingService.list(wrapper);
if (!list1.isEmpty())
return AjaxResult.error("鎵�閫夐」鐩腑鍖呭惈宸插仛妫�楠岄」鐩棤娉曢��璐�");
@@ -1356,7 +1350,7 @@
LambdaUpdateWrapper<TjOrderRemark> wqz = new LambdaUpdateWrapper<>();
wqz.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
wqz.eq(TjOrderRemark::getProId, refundPro.getProId());
- wqz.set(TjOrderRemark::getSfbz,null);
+ wqz.set(TjOrderRemark::getSfbz, null);
remarkService.update(wqz);
}
--
Gitblit v1.8.0