From eac48696e8df9a0a6eace257adcea4ee203d6fe0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 02 一月 2025 16:53:58 +0800
Subject: [PATCH] zjh20250102

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 bfb5fb4..7e7ccbb 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
@@ -2592,7 +2592,7 @@
     @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
     public AjaxResult getTransitionInfo(@RequestParam("tjNumber") String tjNumber) {
         QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
-        wrapper.select("parent_pro_id", "parent_pro_name", "sum(ord_price) as ord_price")
+        wrapper.select("parent_pro_id", "parent_pro_name", "sum(now_price) as ord_price")
                 .eq("tj_num", tjNumber)
                 .groupBy("parent_pro_name");
         List<TbTransition> list = transitionService.list(wrapper);
@@ -3721,5 +3721,13 @@
     }
 
 
+    @GetMapping(value = "newgetTransitionList")
+    @ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
+    public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+        List<TbTransition> list= transitionService.newgetTransitionList(cusId);
+        return AjaxResult.success(list);
+    }
+
+
 }
 

--
Gitblit v1.8.0