From 4d1cc2fd7553f3c648da150971cd4a87c282f5ad Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十月 2023 09:06:44 +0800
Subject: [PATCH] zjh 2023/10/17--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
index b5995f1..8288bcc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
@@ -71,6 +71,7 @@
List<Long> collect =null;
TjCustomer one =null;
+ Date date=new Date();
LambdaQueryWrapper<TjFlowingWater> wq1 = new LambdaQueryWrapper<>();
if(null !=phone || null !=name){
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
@@ -89,7 +90,7 @@
if(null !=collect){
wq1.in(TjFlowingWater::getOrderId, collect);
}
- wq1.between(TjFlowingWater::getCreateTime,DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()));
+ wq1.between(TjFlowingWater::getCreateTime,DateUtil.beginOfDay(date),DateUtil.endOfDay(date));
wq1.eq(TjFlowingWater::getPayStasus,type);
waterList = flowingWaterService.list(wq1);
@@ -112,7 +113,7 @@
@GetMapping("/getTjPrice")
@ApiOperation(value = "鑾峰彇浣撴璐圭敤")
public AjaxResult getTjPrice() {
- TjProject project = projectService.getOne(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProName, "浣撴璐�")
+ TjProject project = projectService.getOne(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProName, "浣撴椤圭洰")
.eq(TjProject::getProId, 1712272744924446722L));
if (null != project) {
return AjaxResult.success(project.getProPrice());
@@ -148,14 +149,17 @@
// } else {
// cusId = one.getCusId();
// }
+ Date date=new Date();
TjOrder tjOrder = new TjOrder();
tjOrder.setUserId(customer.getCusId());
tjOrder.setTjType("2");
//鐢熸垚浣撴鍙�
- String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+ String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(date));
tjOrder.setTjNumber(tjNumber);
tjOrder.setFirmId("0");
tjOrder.setStatus(TjConstants.TJ_BEGIN);
+ tjOrder.setFinishTime(date);
+ tjOrder.setReportTime(date);
if (orderService.save(tjOrder)) {
LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>();
@@ -178,10 +182,10 @@
tjFlowingWater.setPaidIn(vo.getSs());
tjFlowingWater.setDiscount(vo.getZk());
tjFlowingWater.setPayStasus(1L);
- Date date1 = new Date(System.currentTimeMillis());
- String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
+ String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date);
tjFlowingWater.setWaterId(s1);
tjFlowingWater.setRemarks("宸叉敹璐�");
+ tjFlowingWater.setTollCollectorId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
if (flowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
orderService.updateById(tjOrder);
@@ -195,7 +199,7 @@
tjChargingStandard.setCount(Long.valueOf(vo.getNumber()));
chargingStandardService.save(tjChargingStandard);
}
- return AjaxResult.success();
+ return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
}
--
Gitblit v1.8.0