From 66a2bbaed29c6134b84e0916c96916a983bc64e8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 十月 2023 11:02:58 +0800
Subject: [PATCH] zjh 2023/10/20--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java | 75 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 30 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 8288bcc..8679e72 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
@@ -1,19 +1,14 @@
package com.ltkj.web.controller.system;
-import cn.hutool.core.codec.Base64;
+
import cn.hutool.core.date.DateUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
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.MatchUtils;
+import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.NewFlowingWaterVo;
-import com.ltkj.hosp.vodomain.TjCollectFeesVo;
-import com.ltkj.mall.domain.MallCheckLog;
-import com.ltkj.mall.domain.MallOrder;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,10 +17,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -61,12 +52,22 @@
+ @GetMapping("/getNewDate")
+ @ApiOperation(value = "鑾峰彇鏈嶅姟鍣ㄥ綋鍓嶆椂闂�")
+ 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("/getFlowingWaterList")
@ApiOperation(value = "鑾峰彇浣撴鏀惰垂璁板綍鎺ュ彛")
public AjaxResult getFlowingWaterList(@RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String phone,
@RequestParam(required = false) @ApiParam(value = "浣撴浜哄鍚�") String name,
- @RequestParam(defaultValue = "1") @ApiParam(value = "鏀惰垂1 閫�璐�2") Long type) {
+ @RequestParam(defaultValue = "1") @ApiParam(value = "鏀惰垂1 閫�璐�2 4閫�璐瑰憳椤甸潰") Long type) {
List<TjFlowingWater> waterList =null;
List<Long> collect =null;
TjCustomer one =null;
@@ -91,7 +92,15 @@
wq1.in(TjFlowingWater::getOrderId, collect);
}
wq1.between(TjFlowingWater::getCreateTime,DateUtil.beginOfDay(date),DateUtil.endOfDay(date));
- wq1.eq(TjFlowingWater::getPayStasus,type);
+ if(type==1){
+ wq1.eq(TjFlowingWater::getPayStasus,type);
+ wq1.eq(TjFlowingWater::getTollCollectorId, UserHoder.getLoginUser().getUserId());
+ }else if(type==4){
+ wq1.eq(TjFlowingWater::getPayStasus,1);
+ }else {
+ wq1.eq(TjFlowingWater::getPayStasus,type);
+ }
+
waterList = flowingWaterService.list(wq1);
if(null !=waterList && waterList.size()>0){
@@ -100,6 +109,8 @@
if (null != order) {
if (null != customerService.getById(order.getUserId())) {
flowingWater.setCustomer(customerService.getById(order.getUserId()));
+ flowingWater.setTjNumber(order.getTjNumber());
+ flowingWater.setTjProName(flowingWaterService.getproNameByOrderId(order.getTjNumber()));
}
}
}
@@ -130,25 +141,15 @@
@Transactional
public AjaxResult addOrderAndDetail(@RequestBody NewFlowingWaterVo vo) {
- if (!MatchUtils.isMobileNO(vo.getPhone())) {
- return AjaxResult.error("鎵嬫満鍙锋牸寮忔湁璇�!");
- }
-// Long cusId = null;
-// LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjCustomer::getCusName, vo.getName());
-// wq.eq(TjCustomer::getCusPhone, vo.getPhone());
-// TjCustomer one = customerService.getOne(wq);
-// if (null == one) {
+// if (!MatchUtils.isMobileNO(vo.getPhone())) {
+// return AjaxResult.error("鎵嬫満鍙锋牸寮忔湁璇�!");
+// }
TjCustomer customer = new TjCustomer();
if(null !=vo.getPhone())customer.setCusPhone(vo.getPhone());
customer.setCusName(vo.getName());
customer.setCusBrithday(new Date());
customer.setCusSex(0L);
customerService.save(customer);
-// cusId = customer.getCusId();
-// } else {
-// cusId = one.getCusId();
-// }
Date date=new Date();
TjOrder tjOrder = new TjOrder();
tjOrder.setUserId(customer.getCusId());
@@ -171,7 +172,12 @@
TjOrderDetail detail = new TjOrderDetail();
detail.setOrderId(tjOrder.getOrderId());
- detail.setProId(1712272744924446722L);
+ if(null==vo.getTjPro()){
+ detail.setProId(1712272744924446722L);
+ }else {
+ detail.setProId(vo.getTjPro());
+ }
+ detail.setProId(vo.getTjPro());
detail.setProType("0");
detailService.save(detail);
@@ -193,9 +199,18 @@
detailService.updateById(detail);
TjChargingStandard tjChargingStandard = new TjChargingStandard();
tjChargingStandard.setTjNum(tjOrder.getTjNumber());
- tjChargingStandard.setProId(1712272744924446722L);
- tjChargingStandard.setPrice(vo.getYs().divide(BigDecimal.valueOf(Long.parseLong(vo.getNumber()))));
- tjChargingStandard.setProName("浣撴椤圭洰");
+ if(null==vo.getTjPro()){
+ tjChargingStandard.setProId(1712272744924446722L);
+ }else {
+ tjChargingStandard.setProId(vo.getTjPro());
+ }
+ tjChargingStandard.setProId(vo.getTjPro());
+ tjChargingStandard.setPrice(vo.getSs());
+ if(null==vo.getTjProName()){
+ tjChargingStandard.setProName("浣撴椤圭洰");
+ }else {
+ tjChargingStandard.setProName(vo.getTjProName());
+ }
tjChargingStandard.setCount(Long.valueOf(vo.getNumber()));
chargingStandardService.save(tjChargingStandard);
}
--
Gitblit v1.8.0