From e62aa00fe99dd983f35dc09830d3166bc46b1fb1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 26 三月 2024 14:11:11 +0800
Subject: [PATCH] zjh 2024/03/26--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 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 eb0584e..aaedd52 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
@@ -806,21 +806,7 @@
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
- public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder, HttpServletRequest request) throws Exception {
- // 鐢熸垚Token骞朵繚瀛樺埌Session涓�
- String token = UUID.randomUUID().toString(); // 鐢熸垚涓�涓殢鏈哄瓧绗︿覆浣滀负Token
- request.getSession().setAttribute("token", token);
-
-// 鑾峰彇琛ㄥ崟涓殑Token骞朵笌Session涓殑Token姣旇緝
- String formToken = request.getParameter("token");
- if (formToken != null && formToken.equals(request.getSession().getAttribute("token"))) {
- System.out.printf("=================绗竴娆℃彁浜�");
- } else {
- // 閲嶅鎻愪氦浜嗚〃鍗曚俊鎭�
- System.out.printf("=============================閲嶅浜�");
- }
-
-
+ public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -935,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)) {
@@ -956,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());
@@ -966,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);
}
@@ -1107,7 +1099,13 @@
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
- BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
+
+ BigDecimal divide = BigDecimal.valueOf(0);
+ if(tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0))==0 || project.getProPrice().compareTo(BigDecimal.valueOf(0))==0 ){
+ divide=BigDecimal.valueOf(0);
+ }else {
+ divide=tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
+ }
List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
if (null != tjProSonList && tjProSonList.size() > 0) {
//addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
@@ -1714,7 +1712,7 @@
tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
//淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+// transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//娣诲姞remark琛ㄦ暟鎹�
remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
//鍒ゆ柇鏄惁浜ら挶
@@ -1727,6 +1725,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));
}
@@ -1829,4 +1832,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