From 8d11849a4c5f7cf919d77ad29812dbe572134578 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 18 三月 2024 16:02:42 +0800
Subject: [PATCH] 团队等级问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 40e7e6e..4553b5f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -10,6 +10,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.codec.Base64;
@@ -53,6 +54,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -407,7 +409,7 @@
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
order.setTjCusIdCard(tjCustomer.getCusIdcard());
@@ -919,6 +921,12 @@
Date date1 = new Date(System.currentTimeMillis());
String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+
+
+ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
+ tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
+ tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
+
if (isPay.equals("true")) {
if (null != mallOrder) {
if (mallOrder.getOrderStatus().equals(201L)) {
@@ -940,7 +948,8 @@
mallOrder.setOrderStatus(301L);
mallOrderService.updateById(mallOrder);
}
- } else {
+ }
+ else {
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
@@ -950,17 +959,16 @@
if (tjFlowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
tjOrderService.updateById(tjOrder);
+
+
}
//鍥綋
if ("1".equals(tjOrder.getTjType())) {
asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
}
-
-
//涓汉
if ("2".equals(tjOrder.getTjType())) {
-
//asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
@@ -1329,9 +1337,9 @@
for (TjOrderRemark remark : remarkList) {
TjProject project = projectService.getTjProjectById(String.valueOf(remark.getProId()));
if (null != project) {
- if ("N".equals(project.getNeedReport())) {
- continue;
- }
+// if ("N".equals(project.getNeedReport())) {
+// continue;
+// }
remark.setProCheckType(project.getProCheckType());
remark.setProName(project.getProName());
}
@@ -1711,6 +1719,11 @@
if (tjFlowingWater.getPayStasus() == 1L) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
+ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
+ tjFlowingWater.setPayType(4L);
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
}
// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
@@ -1813,4 +1826,40 @@
return AjaxResult.success("鏆傛棤鍘嗗彶璁板綍");
}
+
+ @GetMapping("/getHistryTjOrderByCusId")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛id鏌ョ湅鍘嗗彶浣撴璁板綍")
+ @Transactional
+ public AjaxResult getHistryTjOrderByCusId(@RequestParam String cusId) {
+ TjCustomer tjCustomer = tjCustomerService.getById(cusId);
+ List<HistoryTjOrder> list = new ArrayList<>();
+ if (null != tjCustomer) {
+ List<TjOrder> orderList = tjOrderService.getTjOrderListByCusId(tjCustomer.getCusId());
+ for (TjOrder order : orderList) {
+ HistoryTjOrder historyTjOrder = new HistoryTjOrder();
+ historyTjOrder.setUserName(tjCustomer.getCusName());
+ historyTjOrder.setTjNum(order.getTjNumber());
+ historyTjOrder.setTjTime(order.getCreateTime());
+ historyTjOrder.setTjProName(tjOrderService.getHistoryTjOrderProByTjNum(order.getTjNumber()));
+
+ //鏌ユ祦姘�
+ BigDecimal res = new BigDecimal(0);
+ LambdaQueryWrapper<TjFlowingWater> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjFlowingWater::getOrderId, order.getOrderId());
+ final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqq);
+ if (list1 != null) {
+ for (TjFlowingWater tjFlowingWater : list1) {
+ if (tjFlowingWater!=null && tjFlowingWater.getPaidIn()!=null){
+ res.add(tjFlowingWater.getPaidIn());
+ }
+ }
+ }
+ historyTjOrder.setPaidIn(res);
+ list.add(historyTjOrder);
+ }
+ }
+ return AjaxResult.success(list);
+ }
+
}
+
--
Gitblit v1.8.0