From 178ae29cf4c7144a6dfc12b8c47a0e6acded767b Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 13 九月 2023 15:11:07 +0800
Subject: [PATCH] 采样
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 0cbd25b..e28c260 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
@@ -1325,8 +1325,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);
}
@@ -1537,8 +1540,10 @@
@PostMapping("/deletedTbTransitionByCusId")
@ApiOperation(value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
- public AjaxResult deletedTbTransitionByCusId(@RequestBody String cusId) {
- transitionService.deletedTbTransitionByCusId(cusId);
- return AjaxResult.success();
+ 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