From 9ea8edde96272e14b0deacb81996a65c4fcb5285 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 13 九月 2023 16:49:18 +0800
Subject: [PATCH] 修改接口权限
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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 96cadb5..4c7dad4 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
@@ -132,7 +132,7 @@
/**
* 鏌ヨ浣撴璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:order:list')")
+// @PreAuthorize("@ss.hasPermi('hosp:order:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃(榛樿)")
public TableDataInfo list(TjOrder tjOrder) {
@@ -703,7 +703,7 @@
/**
* 瀵煎嚭浣撴璁板綍鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:order:export')")
+// @PreAuthorize("@ss.hasPermi('hosp:order:export')")
@Log(title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
@@ -717,7 +717,7 @@
/**
* 鑾峰彇浣撴璁板綍璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('hosp:order:query')")
+// @PreAuthorize("@ss.hasPermi('hosp:order:query')")
@GetMapping(value = "/{orderId}")
@ApiOperation(value = "鑾峰彇浣撴璁板綍璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("orderId") Long orderId) {
@@ -858,7 +858,9 @@
//涓汉
if ("2".equals(tjOrder.getTjType())) {
- asyncService.extracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+// asyncService.extracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+
+ asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
return AjaxResult.success(tjNumber);
}
@@ -869,7 +871,7 @@
/**
* 淇敼浣撴璁板綍
*/
- @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
+// @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
@Log(title = "浣撴璁板綍", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼浣撴璁板綍")
@@ -880,7 +882,7 @@
/**
* 鍒犻櫎浣撴璁板綍
*/
- @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
+// @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
@Log(title = "浣撴璁板綍", businessType = BusinessType.DELETE)
@DeleteMapping("/{orderIds}")
@ApiOperation(value = "鍒犻櫎浣撴璁板綍")
@@ -959,15 +961,17 @@
TbTransition tbTransition = new TbTransition();
tbTransition.setCusId(cusId);
tbTransition.setPacId(pacId);
- if (null != tjProject.getProPrice()) {
- tbTransition.setOrdPrice(tjProject.getProPrice());
- } else {
- tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
- }
+// if (null != tjProject.getProPrice()) {
+// tbTransition.setOrdPrice(tjProject.getProPrice());
+// } else {
+// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
+// }
if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
- tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_UP));
+ tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
+ tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
} else {
tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
+ tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
}
tbTransition.setParentProId(project.getProId());
tbTransition.setParentProName(project.getProName());
@@ -1323,8 +1327,11 @@
tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
}
}
- map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
- map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+// map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+// map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+
+ map.put("ordPrice", money1);
+ map.put("nowPrice", money2);
}
list.add(map);
}
@@ -1531,4 +1538,14 @@
}
return AjaxResult.success(aaa);
}
+
+
+ @PostMapping("/deletedTbTransitionByCusId")
+ @ApiOperation(value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusId) {
+ LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>();
+ wq.between(TbTransition::getCreateTime,transitionService.getTbTransitionCreateTimeByCusId(cusId),new Date());
+ wq.eq(TbTransition::getCusId,cusId);
+ return AjaxResult.success(transitionService.remove(wq));
+ }
}
--
Gitblit v1.8.0