From 1e8505dbe7ba0984c12e220fb71b5a13fcecf96d Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 13 九月 2023 15:47:13 +0800
Subject: [PATCH] 采样

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 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..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
@@ -959,15 +959,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 +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);
         }
@@ -1531,4 +1536,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