From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 e2a3f10..2feb41c 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
@@ -23,6 +23,7 @@
import io.swagger.annotations.ApiParam;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -202,16 +203,24 @@
SysUser sysUser = userService.getById(userId);
TjFlowingWater flowingWater = tjFlowingWaterService.getById(tjFlowingWater.getTjSerialNumber());
- tjFlowingWater.setTollCollectorId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
- tjFlowingWater.setPayStasus(1L);
+// tjFlowingWater.setTollCollectorId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
+// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
+
+ 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() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() +SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWaterService.save(tjFlowingWater)) {
//寮傛鍗曢」鏀惰垂鏄庣粏
asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser);
+// if(!b){
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// }
//extracted(tjFlowingWater, order, customer);
Map<String, Object> map = new HashMap<>();
map.put("waterId", tjFlowingWater.getWaterId());
--
Gitblit v1.8.0