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/TjNewFlowingWaterController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 8679e72..fb2a09c 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
@@ -4,6 +4,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
@@ -49,6 +50,8 @@
private ITjProjectService projectService;
@Resource
private ITjChargingStandardService chargingStandardService;
+ @Resource
+ private ITjOrderRemarkService remarkService;
@@ -57,6 +60,15 @@
public AjaxResult getNewDate() {
Date date = DateUtil.parse(DateUtil.format(DateUtil.date(),"yyyy-MM-dd HH:mm:ss"),"yyyy-MM-dd HH:mm:ss");
+ return AjaxResult.success(date);
+ }
+
+
+ @GetMapping("/getNewDateList")
+ @ApiOperation(value = "鑾峰彇鏈嶅姟鍣ㄥ綋鏃堕棿娈�")
+ public AjaxResult getNewDateList() {
+
+ Date date = DateUtil.parse(DateUtil.format(DateUtil.date(),"yyyy-MM-dd"),"yyyy-MM-dd");
return AjaxResult.success(date);
}
@@ -129,7 +141,7 @@
if (null != project) {
return AjaxResult.success(project.getProPrice());
}
- return AjaxResult.error("娌℃壘鍒板搴旈」鐩� 璇疯嚜瀹氫箟璐圭敤");
+ return AjaxResult.success("娌℃壘鍒板搴旈」鐩� 璇疯嚜瀹氫箟璐圭敤");
}
@@ -140,6 +152,7 @@
@ApiOperation(value = "浣撴鏀惰垂鎺ュ彛")
@Transactional
public AjaxResult addOrderAndDetail(@RequestBody NewFlowingWaterVo vo) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
// if (!MatchUtils.isMobileNO(vo.getPhone())) {
// return AjaxResult.error("鎵嬫満鍙锋牸寮忔湁璇�!");
@@ -177,9 +190,10 @@
}else {
detail.setProId(vo.getTjPro());
}
- detail.setProId(vo.getTjPro());
detail.setProType("0");
detailService.save(detail);
+
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), user.getNickName(), String.valueOf(user.getUserId()), String.valueOf(tjOrder.getOrderId()));
TjFlowingWater tjFlowingWater = new TjFlowingWater();
tjFlowingWater.setOrderId(tjOrder.getOrderId());
@@ -246,6 +260,7 @@
tjFlowingWater.setPaidIn(BigDecimal.valueOf(0.00).subtract(tjFlowingWater.getRefundPrice()));
tjFlowingWater.setCopeWith(flowingWater.getCopeWith());
tjFlowingWater.setRemarks("宸查��璐�");
+ tjFlowingWater.setPayType(flowingWater.getPayType());
if (flowingWaterService.save(tjFlowingWater)) {
flowingWater.setRemarks("宸查��璐�");
flowingWaterService.updateById(flowingWater);
--
Gitblit v1.8.0