From 308589effc0fe60876a5794571ede0c211cc828c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 10 一月 2025 17:25:09 +0800
Subject: [PATCH] zjh20250110

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index c296ee3..38da148 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -144,6 +144,7 @@
             "   parent_pro_id,\n" +
             "   parent_pro_name,\n" +
             "   ord_price,\n" +
+            "   discount,\n" +
             "   now_price,\n" +
             "   create_time,\n" +
             "   pro_check_method,\n" +
@@ -158,9 +159,9 @@
             "\tc.pro_name,\n" +
             "\tb.pro_id,\n" +
             "\tb.pro_name,\n" +
-            "\tTRUNCATE(c.pro_price,2),\n" +
-            "\tTRUNCATE(c.pro_price,2),\n" +
-//            " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
+            "\t(c.pro_price * c.sl),\n" +
+            "\ta.limits,\n" +
+            "\t((c.pro_price * c.sl) * (a.limits/10)),\n" +
             "\tSYSDATE(),\n" +
             "\tc.pro_check_method,\n" +
             "\tIFNULL(c.pro_type,''),\n" +
@@ -179,7 +180,7 @@
             "(cus_id, pro_id, pro_name, parent_pro_id, parent_pro_name, ord_price, now_price, create_time, pro_check_method, pro_type,card_id ) \n" +
             "SELECT\n" +
             "#{cusId},\n" +
-            "a.pro_id,a.pro_name,b.pro_id,b.pro_name,a.pro_price,a.pro_price,SYSDATE(),a.pro_check_method,\n" +
+            "a.pro_id,a.pro_name,b.pro_id,b.pro_name,a.pro_price * a.sl,a.pro_price * a.sl,SYSDATE(),a.pro_check_method,\n" +
             "IFNULL ( a.pro_type, '' ), \n" +
             "#{cardId}\n" +
             "FROM\n" +
@@ -211,9 +212,9 @@
             "c.pro_name,\n" +
             "b.pro_id,\n" +
             "b.pro_name,\n" +
-            "c.pro_price,\n" +
+            "(c.pro_price * c.sl),\n" +
             "a.limits,\n" +
-            "c.pro_price * (a.limits/10),\n" +
+            "((c.pro_price * c.sl) * (a.limits/10)),\n" +
             "SYSDATE(),\n" +
             "c.pro_check_method,\n" +
             "c.pro_type\n" +
@@ -249,9 +250,9 @@
             "c.pro_name,\n" +
             "b.pro_id,\n" +
             "b.pro_name,\n" +
-            "c.pro_price,\n" +
+            "(c.pro_price * c.sl),\n" +
             "a.limits,\n" +
-            "(c.pro_price * (a.limits/10)),\n" +
+            "((c.pro_price * c.sl) * (a.limits/10)),\n" +
             "SYSDATE(),\n" +
             "c.pro_check_method,\n" +
             "c.pro_type,\n" +

--
Gitblit v1.8.0