From d8b9f897e40a9640780a64cf7569e306d65b156b Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 18:02:54 +0800
Subject: [PATCH] 报告
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 117 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 36 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 bd6ff4f..f8c5ffc 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
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
@@ -68,7 +69,8 @@
private TjAsyncService asyncService;
@Resource
private IJimuOnlineReportService reportService;
-
+ @Resource
+ private ITjPackageProjectService tjPackageProjectService;
/**
* 鏌ヨ璇ヤ綋妫�鍙峰搴旂殑璁㈠崟娴佹按鍒楄〃
@@ -205,7 +207,7 @@
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
TjCustomer customer = customerService.getById(order.getUserId());
if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
- tjFlowingWater.setWaterId(SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWaterService.save(tjFlowingWater)) {
//寮傛鍗曢」鏀惰垂鏄庣粏
@@ -303,8 +305,8 @@
List<TjOrderDetail> detailList = detailService.list(wq2);
if (null != detailList && detailList.size() > 0) {
TjRefundVo tjRefundVo = new TjRefundVo();
- tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
- tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setTjNumber(order.getTjNumber());
tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
if (null != order.getDictCompName()) tjRefundVo.setTjComp(order.getDictCompName());
@@ -350,8 +352,8 @@
TjCustomer customer = customerService.getById(order.getUserId());
if (null != customer) {
TjRefundVo tjRefundVo = new TjRefundVo();
- tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
- tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setTjNumber(order.getTjNumber());
tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
if (null != order.getDictCompName()) tjRefundVo.setTjComp(order.getDictCompName());
@@ -415,10 +417,10 @@
if (null != detailList && detailList.size() > 0) {
TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
- tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
- tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- if(null !=customer.getCusIdcard()) tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ if(null !=customer.getCusIdcard()) tjRefundVo.setIdCard(customer.getCusIdcard());
DictComp dictComp = compService.getById(order.getFirmId());
if(null !=dictComp){
tjRefundVo.setTjComp(dictComp.getCnName());
@@ -481,7 +483,7 @@
if (null != tjNum) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.likeLeft(TjOrder::getTjNumber, tjNum);
- wq1.eq(TjOrder::getCheckStatus, 0);
+// wq1.eq(TjOrder::getCheckStatus, 0);
List<TjOrder> orderList = orderService.list(wq1);
if (null != orderList && orderList.size() > 0) {
for (TjOrder order : orderList) {
@@ -494,12 +496,16 @@
if (null != customer) {
TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
- tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
- tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- if (null != order.getDictCompName())
- tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
+ 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())
@@ -536,10 +542,11 @@
} else {
tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId);
}
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber());
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
- //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+/* //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
// wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
// wqq1.eq(TbTransition::getParentProId, project.getProId());
// List<TbTransition> tbTransitionList = transitionService.list(wqq1);
@@ -555,8 +562,10 @@
project.getProId());
String s = tjFlowingWaterService.getDiscount(OrderId);
if(null !=decimal){
- project.setProPrice(decimal.setScale(2));
- project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
+// project.setProPrice(decimal.setScale(2));
+ project.setProPrice(decimal);
+// project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
+ project.setProOrdPrice(decimal);
}else {
BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
if(null !=decimal1){
@@ -566,8 +575,33 @@
project.setProPrice(new BigDecimal("0.00").setScale(2));
project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
}
+ }*/
+ String s = tjFlowingWaterService.getDiscount(OrderId);
+ if(null !=pacId){
+ TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+ .eq(TjPackageProject::getProId,String.valueOf(project.getProId())));
+ if(null !=pp){
+ 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));
+ }
+ }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"));
+ 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){
+ TjProject project = projectService.selectTjProjectByProId(1735504273274236929L);
+ project.setProOrdPrice(project.getProPrice());
+ tjProjectList.add(project);
}
}
return AjaxResult.success(tjProjectList);
@@ -586,7 +620,7 @@
public AjaxResult getTjRefundProInfoVoList(@RequestParam @ApiParam(value = "浣撴璁㈠崟id") String orderId) {
TjOrder tjOrder = orderService.getById(orderId);
if (null == tjOrder) return AjaxResult.error("璇ヤ綋妫�璁板綍涓嶅瓨鍦�");
- TjCustomer customer = customerService.getById(tjOrder.getUserId());
+// TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (tjOrder.getCheckStatus() == 0 && tjOrder.getReportTime() == null) {
LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderDetail::getOrderId, orderId);
@@ -595,32 +629,43 @@
wq.ne(TjOrderDetail::getTjStatus,3);
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq);
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber());
if (null != detailList && detailList.size() > 0) {
List<TjRefundProInfoVo> tjRefundProInfoVoList = new ArrayList<>();
for (TjOrderDetail detail : detailList) {
TjProject project = projectService.getById(detail.getProId());
if (project.getProParentId() == 0) {
- LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
- wqq1.eq(TbTransition::getCusId, customer.getCusIdcard());
- wqq1.eq(TbTransition::getParentProId, project.getProId());
- List<TbTransition> tbTransitionList = transitionService.list(wqq1);
- BigDecimal bigDecimal = new BigDecimal("0.00");
- BigDecimal bigDecimal1 = new BigDecimal("0.00");
- for (TbTransition transition : tbTransitionList) {
- bigDecimal = bigDecimal.add(transition.getNowPrice());
- bigDecimal1 = bigDecimal1.add(transition.getOrdPrice());
- }
+// LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+// wqq1.eq(TbTransition::getCusId, customer.getCusIdcard());
+// wqq1.eq(TbTransition::getParentProId, project.getProId());
+// List<TbTransition> tbTransitionList = transitionService.list(wqq1);
+// BigDecimal bigDecimal = new BigDecimal("0.00");
+// BigDecimal bigDecimal1 = new BigDecimal("0.00");
+// for (TbTransition transition : tbTransitionList) {
+// bigDecimal = bigDecimal.add(transition.getNowPrice());
+// bigDecimal1 = bigDecimal1.add(transition.getOrdPrice());
+// }
+ String s = tjFlowingWaterService.getDiscount(orderId);
TjRefundProInfoVo proInfoVo = new TjRefundProInfoVo();
- // double discount = Double.parseDouble(tjFlowingWaterService.getById(detail.getFlowingWaterId()).getDiscount());
- //BigDecimal decimal = BigDecimal.valueOf(discount).divide(BigDecimal.valueOf(100));
- //proInfoVo.setNetReceipts(bigDecimal.multiply(decimal).setScale(2, BigDecimal.ROUND_DOWN));
- proInfoVo.setNetReceipts(bigDecimal);
+
+ if(null !=pacId){
+ TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+ .eq(TjPackageProject::getProId,String.valueOf(project.getProId())));
+ if(null !=pp){
+ proInfoVo.setNetReceipts(pp.getPriceNow().multiply(new BigDecimal(s)));
+ proInfoVo.setPrice(pp.getPriceNow());
+ }else {
+ proInfoVo.setNetReceipts(project.getProPrice().multiply(new BigDecimal(s)));
+ proInfoVo.setPrice(project.getProPrice());
+ }
+ }else {
+ proInfoVo.setNetReceipts(project.getProPrice().multiply(new BigDecimal(s)));
+ proInfoVo.setPrice(project.getProPrice());
+ }
proInfoVo.setCollectFeesTime(tjFlowingWaterService.getById(detail.getFlowingWaterId()).getUpdateTime());
proInfoVo.setTollCollector(userService.getById(tjFlowingWaterService.getById(detail.getFlowingWaterId()).getTollCollectorId()).getNickName());
proInfoVo.setProName(project.getProName());
proInfoVo.setProId(String.valueOf(project.getProId()));
- //proInfoVo.setPrice(project.getProPrice().setScale(2, BigDecimal.ROUND_DOWN));
- proInfoVo.setPrice(bigDecimal1);
tjRefundProInfoVoList.add(proInfoVo);
}
}
@@ -643,7 +688,7 @@
tjFlowingWater.setRefundTime(new Date());
tjFlowingWater.setIsAddition("N");
tjFlowingWater.setPayStasus(2L);
- tjFlowingWater.setWaterId(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)){
--
Gitblit v1.8.0