From 623aaa8471d6d7adf1cb9ee584fc20da6c26f603 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 18:03:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 101 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 50 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 f8c5ffc..6b179a0 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
@@ -89,12 +89,12 @@
map.put("water", list);
}
LambdaQueryWrapper<TjChargingStandard> wq3 = new LambdaQueryWrapper<>();
- wq3.eq(TjChargingStandard::getTjNum,TjNumber);
+ wq3.eq(TjChargingStandard::getTjNum, TjNumber);
List<TjChargingStandard> list = chargingStandardService.list(wq3);
- if (null !=list && list.size()>0){
+ if (null != list && list.size() > 0) {
for (TjChargingStandard standard : list) {
TjProject project = projectService.getById(standard.getProId());
- if (null !=project && null!=project.getProCheckType()) {
+ if (null != project && null != project.getProCheckType()) {
standard.setProCheckType(project.getProCheckType());
}
}
@@ -211,19 +211,19 @@
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWaterService.save(tjFlowingWater)) {
//寮傛鍗曢」鏀惰垂鏄庣粏
- asyncService.iundividualCharges(tjFlowingWater, order, customer,sysUser);
+ asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser);
//extracted(tjFlowingWater, order, customer);
- Map<String,Object>map=new HashMap<>();
- map.put("waterId",tjFlowingWater.getWaterId());
- map.put("mobanId",reportService.getMoBanIds());
- return AjaxResult.success("鏀惰垂鎴愬姛",map);
+ Map<String, Object> map = new HashMap<>();
+ map.put("waterId", tjFlowingWater.getWaterId());
+ map.put("mobanId", reportService.getMoBanIds());
+ return AjaxResult.success("鏀惰垂鎴愬姛", map);
}
}
- if(flowingWater.getPayStasus()==1){
+ if (flowingWater.getPayStasus() == 1) {
return AjaxResult.success("璇ヨ鍗曞凡浠樻 鏃犻』鍐嶄粯");
}
- if (tjFlowingWaterService.updateById(tjFlowingWater)){
+ if (tjFlowingWaterService.updateById(tjFlowingWater)) {
LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId());
wq2.isNull(TjOrderDetail::getFlowingWaterId);
@@ -241,14 +241,14 @@
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
wqq.in(TbTransition::getProId, detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()));
List<TbTransition> tbTransitionList = transitionService.list(wqq);
- if(null != tbTransitionList && tbTransitionList.size() > 0){
+ if (null != tbTransitionList && tbTransitionList.size() > 0) {
// extracted(order, list2, tbTransitionList);
//寮傛娣诲姞鏀惰垂鏄庣粏
- asyncService.collectFees(order,list2,tbTransitionList,sysUser,tjFlowingWater.getDiscount());
- Map<String,Object>map=new HashMap<>();
- map.put("waterId",tjFlowingWater.getWaterId());
- map.put("mobanId",reportService.getMoBanIds());
- return AjaxResult.success("鏀惰垂鎴愬姛",map);
+ asyncService.collectFees(order, list2, tbTransitionList, sysUser, tjFlowingWater.getDiscount());
+ Map<String, Object> map = new HashMap<>();
+ map.put("waterId", tjFlowingWater.getWaterId());
+ map.put("mobanId", reportService.getMoBanIds());
+ return AjaxResult.success("鏀惰垂鎴愬姛", map);
}
}
return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲閲嶅鏀惰垂");
@@ -420,11 +420,11 @@
tjRefundVo.setTjName(customer.getCusName());
tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- if(null !=customer.getCusIdcard()) tjRefundVo.setIdCard(customer.getCusIdcard());
+ if (null != customer.getCusIdcard()) tjRefundVo.setIdCard(customer.getCusIdcard());
DictComp dictComp = compService.getById(order.getFirmId());
- if(null !=dictComp){
+ if (null != dictComp) {
tjRefundVo.setTjComp(dictComp.getCnName());
- }else {
+ } else {
tjRefundVo.setTjComp("鏃�");
}
if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
@@ -433,7 +433,7 @@
wq.eq(TjFlowingWater::getIsAddition, "N");
wq.ne(TjFlowingWater::getPayStasus, 2);
TjFlowingWater one = tjFlowingWaterService.getOne(wq);
- // tjRefundVo.setPaidIn(String.valueOf(one.getPaidIn()));
+ // tjRefundVo.setPaidIn(String.valueOf(one.getPaidIn()));
tjRefundVo.setTjFlowingWater(one);
tjRefundVo.setTjNumber(order.getTjNumber());
tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
@@ -441,7 +441,7 @@
}
}
}
- // TjOrder order = null;
+ // TjOrder order = null;
// if (null != tjOrders && tjOrders.size() > 0) {
// order = tjOrders.get(0);
// }
@@ -500,9 +500,9 @@
tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
tjRefundVo.setIdCard(customer.getCusIdcard());
- if (null != order.getFirmId()){
+ if (null != order.getFirmId()) {
DictComp byId = compService.getById(order.getFirmId());
- if(null != byId){
+ if (null != byId) {
tjRefundVo.setTjComp(byId.getCnName());
}
}
@@ -510,7 +510,7 @@
TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, order.getOrderId())
.eq(TjFlowingWater::getIsAddition, "N")
- .ne(TjFlowingWater::getPayStasus, 2) );
+ .ne(TjFlowingWater::getPayStasus, 2));
tjRefundVo.setTjFlowingWater(one);
tjRefundVo.setTjNumber(order.getTjNumber());
tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
@@ -577,28 +577,28 @@
}
}*/
String s = tjFlowingWaterService.getDiscount(OrderId);
- if(null !=pacId){
+ if (null != pacId) {
TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
- .eq(TjPackageProject::getProId,String.valueOf(project.getProId())));
- if(null !=pp){
+ .eq(TjPackageProject::getProId, String.valueOf(project.getProId())));
+ if (null != pp) {
project.setProPrice(pp.getPriceNow());
project.setProOrdPrice(pp.getPriceNow().multiply(new BigDecimal(s)));
- }else {
+ } else {
project.setProPrice(project.getProPrice().setScale(2));
project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)).setScale(2));
}
- }else {
+ } else {
project.setProPrice(project.getProPrice().setScale(2));
project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)).setScale(2));
}
}
}
TjPackageProject ppp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
- .eq(TjPackageProject::getProId,"1735504273274236929"));
+ .eq(TjPackageProject::getProId, "1735504273274236929"));
List<TjFlowingWater> list = tjFlowingWaterService.list(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, order)
.eq(TjFlowingWater::getPayStasus, 2));
- if(null != ppp && tjProjectList.size() > 0 &&null !=list&& list.size()>0){
+ if (null != ppp && tjProjectList.size() > 0 && null != list && list.size() > 0) {
TjProject project = projectService.selectTjProjectByProId(1735504273274236929L);
project.setProOrdPrice(project.getProPrice());
tjProjectList.add(project);
@@ -625,8 +625,8 @@
LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderDetail::getOrderId, orderId);
//wq.eq(TjOrderDetail::getTjStatus, 0);
- wq.ne(TjOrderDetail::getTjStatus,1);
- wq.ne(TjOrderDetail::getTjStatus,3);
+ wq.ne(TjOrderDetail::getTjStatus, 1);
+ wq.ne(TjOrderDetail::getTjStatus, 3);
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq);
String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber());
@@ -648,17 +648,17 @@
String s = tjFlowingWaterService.getDiscount(orderId);
TjRefundProInfoVo proInfoVo = new TjRefundProInfoVo();
- if(null !=pacId){
+ if (null != pacId) {
TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
- .eq(TjPackageProject::getProId,String.valueOf(project.getProId())));
- if(null !=pp){
+ .eq(TjPackageProject::getProId, String.valueOf(project.getProId())));
+ if (null != pp) {
proInfoVo.setNetReceipts(pp.getPriceNow().multiply(new BigDecimal(s)));
proInfoVo.setPrice(pp.getPriceNow());
- }else {
+ } else {
proInfoVo.setNetReceipts(project.getProPrice().multiply(new BigDecimal(s)));
proInfoVo.setPrice(project.getProPrice());
}
- }else {
+ } else {
proInfoVo.setNetReceipts(project.getProPrice().multiply(new BigDecimal(s)));
proInfoVo.setPrice(project.getProPrice());
}
@@ -681,17 +681,18 @@
*/
@PostMapping("/tjRefund")
@ApiOperation(value = "浣撴閫�璐规寜閽帴鍙�")
- public AjaxResult tjRefund(@RequestBody @ApiParam(value = "娴佹按瀵硅薄") TjFlowingWater tjFlowingWater){
- if(null == tjFlowingWater.getRefundPros()||tjFlowingWater.getRefundPros().size()==0) return AjaxResult.error("璇烽�夋嫨閫�璐归」鐩�");
+ public AjaxResult tjRefund(@RequestBody @ApiParam(value = "娴佹按瀵硅薄") TjFlowingWater tjFlowingWater) {
+ if (null == tjFlowingWater.getRefundPros() || tjFlowingWater.getRefundPros().size() == 0)
+ return AjaxResult.error("璇烽�夋嫨閫�璐归」鐩�");
tjFlowingWater.setTollCollectorId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
tjFlowingWater.setRefundPersonId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
tjFlowingWater.setRefundTime(new Date());
tjFlowingWater.setIsAddition("N");
tjFlowingWater.setPayStasus(2L);
- tjFlowingWater.setWaterId("TF"+SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
+ tjFlowingWater.setWaterId("TF" + SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setPaidIn(BigDecimal.valueOf(0.00).subtract(tjFlowingWater.getRefundPrice()));
tjFlowingWater.setCopeWith(tjFlowingWater.getRefundPrice());
- if (tjFlowingWaterService.save(tjFlowingWater)){
+ if (tjFlowingWaterService.save(tjFlowingWater)) {
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
for (TjProject refundPro : tjFlowingWater.getRefundPros()) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
@@ -742,17 +743,17 @@
}
}
}
- LambdaQueryWrapper<TjOrderRemark>wqz=new LambdaQueryWrapper<>();
- wqz.eq(TjOrderRemark::getTjNumber,order.getTjNumber());
- wqz.eq(TjOrderRemark::getProId,refundPro.getProId());
+ LambdaQueryWrapper<TjOrderRemark> wqz = new LambdaQueryWrapper<>();
+ wqz.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+ wqz.eq(TjOrderRemark::getProId, refundPro.getProId());
remarkService.remove(wqz);
}
List<TjProject> refundPros = tjFlowingWater.getRefundPros();
- asyncService.tjRefund(refundPros,order.getTjNumber());
- Map<String,Object>map=new HashMap<>();
- map.put("waterId",tjFlowingWater.getWaterId());
- map.put("mobanId",reportService.getMoBanId());
- return AjaxResult.success("閫�璐规垚鍔�",map);
+ asyncService.tjRefund(refundPros, order.getTjNumber());
+ Map<String, Object> map = new HashMap<>();
+ map.put("waterId", tjFlowingWater.getWaterId());
+ map.put("mobanId", reportService.getMoBanId());
+ return AjaxResult.success("閫�璐规垚鍔�", map);
}
return AjaxResult.error();
}
--
Gitblit v1.8.0