From c7e35e1bca7221ac8a1ffe7df99493daf50b189f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 06 二月 2025 09:31:21 +0800
Subject: [PATCH] 20250206

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 100 insertions(+), 13 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 9312fb3..ddb735e 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
@@ -102,7 +102,7 @@
     @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId}  AND pro_id =#{proId} and ISNULL(tj_num)")
     public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
 
-    @Select("SELECT DISTINCT pac_id FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
+    @Select("SELECT DISTINCT pac_id FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id) AND ISNULL(tj_num)")
     String getTbTransitionPacIdByCusIdAndPac(String cusId);
 
     @Select("SELECT SUM(a.now_price) now_price FROM tb_transition a WHERE cus_id=#{cusId}")
@@ -118,6 +118,12 @@
             "a.tj_num=#{tjNum}"+
             " WHERE a.cus_id=#{cusId}  AND ISNULL(a.tj_num) ")
     boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount,@Param("tjNum")String tjNum);
+
+
+    @Update("UPDATE tb_transition a SET \n" +
+            "a.tj_num=#{tjNum}"+
+            " WHERE a.cus_id=#{cusId}  AND ISNULL(a.tj_num) ")
+    boolean updateTbTransitionTjNumByCusId(@Param("cusId")String cusId,@Param("tjNum")String tjNum);
 
 
     @Update("UPDATE tb_transition a SET \n" +
@@ -138,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" +
@@ -152,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" +
@@ -165,7 +172,7 @@
             "\tLEFT JOIN tj_project c ON b.pro_id = c.pro_parent_id\n" +
             "\tLEFT JOIN tj_package d ON a.pac_id=d.pac_id\n" +
             "\t\n" +
-            "\tWHERE a.pac_id=#{pacId} and c.deleted=0")
+            "\tWHERE a.pac_id=#{pacId} and c.deleted=0 and c.pro_status=0")
     void saveRedisTransitionByPacId(@Param("cusId") String cusId,@Param("cardId")String cardId,@Param("pacId") Long pacId);
 
 
@@ -173,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" +
@@ -182,7 +189,7 @@
             "\ttj_project b \n" +
             "\tON a.pro_parent_id = b.pro_id \n" +
             "WHERE\n" +
-            "\ta.pro_id = #{proId}")
+            "\ta.pro_id = #{proId} and a.pro_status=0")
     void saveRedisTransitionByProId(@Param("cusId")String cusId,@Param("cardId")String cardId,@Param("proId") Long proId);
 
 
@@ -193,6 +200,7 @@
             "   parent_pro_id,\n" +
             "   parent_pro_name,\n" +
             "   ord_price,\n" +
+            "   discount,\n" +
             "   now_price,\n" +
             "   create_time,\n" +
             "   pro_check_method,\n" +
@@ -204,8 +212,9 @@
             "c.pro_name,\n" +
             "b.pro_id,\n" +
             "b.pro_name,\n" +
-            "c.pro_price * (a.limits/10),\n" +
-            "c.pro_price * (a.limits/10),\n" +
+            "(c.pro_price * c.sl),\n" +
+            "a.limits,\n" +
+            "((c.pro_price * c.sl) * (a.limits/10)),\n" +
             "SYSDATE(),\n" +
             "c.pro_check_method,\n" +
             "c.pro_type\n" +
@@ -213,8 +222,48 @@
             "\ttj_grouping_pro a\n" +
             "\tLEFT JOIN tj_project b ON a.pro_id = b.pro_id \n" +
             "\tLEFT JOIN tj_project c ON c.pro_parent_id=b.pro_id\n" +
-            "WHERE 1=1 AND a.grouping_id =#{groupingId} and c.deleted=0 ")
+            "WHERE 1=1 AND a.grouping_id =#{groupingId} and c.deleted=0 and c.pro_status=0")
     boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);
+
+
+    @Insert("INSERT INTO tb_transition(\n" +
+            "   cus_id,\n" +
+            "   pac_id,\n" +
+            "   pac_name,\n" +
+            "   pro_id,\n" +
+            "   pro_name,\n" +
+            "   parent_pro_id,\n" +
+            "   parent_pro_name,\n" +
+            "   ord_price,\n" +
+            "   discount,\n" +
+            "   now_price,\n" +
+            "   create_time,\n" +
+            "   pro_check_method,\n" +
+            "   pro_type,\n" +
+            "   card_id\n" +
+            ")\n" +
+            "SELECT\n" +
+            "#{cusId},\n" +
+            "#{groupingId},\n" +
+            "d.grouping_name,\n" +
+            "c.pro_id,\n" +
+            "c.pro_name,\n" +
+            "b.pro_id,\n" +
+            "b.pro_name,\n" +
+            "(c.pro_price * c.sl),\n" +
+            "a.limits,\n" +
+            "((c.pro_price * c.sl) * (a.limits/10)),\n" +
+            "SYSDATE(),\n" +
+            "c.pro_check_method,\n" +
+            "c.pro_type,\n" +
+            "\t#{cardId}\n" +
+            "FROM\n" +
+            "\ttj_grouping_pro a \n" +
+            "JOIN tj_dw_grouping d ON d.id=a.grouping_id \n" +
+            "\tLEFT JOIN tj_project b ON a.pro_id = b.pro_id \n" +
+            "\tLEFT JOIN tj_project c ON c.pro_parent_id=b.pro_id\n" +
+            "WHERE 1=1 AND a.grouping_id =#{groupingId} and c.deleted=0 and c.pro_status=0")
+    boolean ttsaveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("cardId") String cardId,@Param("groupingId") String groupingId);
 
 
 //    @Select("SELECT b.price_now FROM \n" +
@@ -226,8 +275,8 @@
 //            "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
 //    BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
 
-    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId}")
-    BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
+    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} and isnull(a.tj_num) AND a.parent_pro_id=#{proId}")
+    BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")String proId);
 
 
     @Select("SELECT SUM(c.pro_price) FROM tj_project c WHERE c.pro_id IN " +
@@ -239,7 +288,7 @@
     @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId} AND !ISNULL(a.pac_id)")
     String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("cardId")String cardId);
 
-    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId} and a.card_id=#{cardId} and a.pac_id=#{pacId}")
+    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId} and a.card_id=#{cardId} and a.pac_id=#{pacId} GROUP BY a.parent_pro_id")
     BigDecimal getTbTransitionDxPriceByPac(@Param("cusId")String cusId,@Param("proId")Long proId,@Param("cardId")String cardId,@Param("pacId")Long pacId);
 
 
@@ -289,4 +338,42 @@
             "WHERE b.pro_id IN(SELECT DISTINCT a.parent_pro_id FROM tb_transition a WHERE a.cus_id=#{idCard} AND ISNULL(a.tj_num))" +
             "AND b.pac_id=#{pacId}")
     String panduantaocanshifouchongfu(@Param("idCard") String idCard,@Param("pacId") Long pacId);
+
+
+
+    @Select("SELECT GROUP_CONCAT(c.pro_name SEPARATOR ' ; ' ) FROM tj_grouping_pro b JOIN tj_project c ON c.pro_id=b.pro_id\n" +
+            "\n" +
+            "WHERE b.pro_id IN(SELECT DISTINCT a.parent_pro_id FROM tb_transition a WHERE a.cus_id=#{idCard} AND ISNULL(a.tj_num))" +
+            "AND b.grouping_id=#{pacId}")
+    String ttpanduantaocanshifouchongfu(@Param("idCard") String idCard,@Param("pacId") Long pacId);
+
+
+    @Select("SELECT a.parent_pro_id,a.cus_id,a.parent_pro_name pro_name,b.pro_type,SUM(a.now_price) now_price,SUM(a.ord_price) ord_price,b.pro_check_method,a.discount FROM tb_transition a " +
+            "LEFT JOIN tj_project b ON b.pro_id=a.parent_pro_id WHERE ISNULL(a.tj_num) AND a.cus_id=#{idCard} GROUP BY a.parent_pro_id")
+    List<TbTransition> newgetTransitionList(String cusId);
+
+
+    @Select("SELECT * FROM tb_transition a WHERE a.tj_num=#{tjNumber} AND a.cus_id=#{idCard} AND a.now_price>0 AND a.discount !=10 ORDER BY a.create_time DESC LIMIT 1 \n")
+    TbTransition getOnwTbTransition(@Param("idCard") String idCard,@Param("tjNumber")String tjNumber);
+
+
+    @Update("UPDATE tb_transition t JOIN (SELECT a.id FROM tb_transition a \n" +
+            "WHERE a.cus_id=#{idCard} AND a.pac_id=#{pacId}   " +
+            "AND ISNULL(a.tj_num) AND a.now_price !=0 ORDER BY a.now_price DESC LIMIT 1)aa ON aa.id=t.id\n" +
+            "SET \n" +
+            "t.now_price=(t.now_price+#{cj})\n" +
+            "WHERE t.id=aa.id")
+    void  buxiangmuchajia(@Param("idCard") String idCard,@Param("pacId") String pacId,@Param("proId") String proId,@Param("cj") BigDecimal cj);
+
+
+    @Select("SELECT a.pac_id FROM tb_transition a WHERE  a.cus_id=#{idCard} AND isnull(a.tj_num) and !isnull(a.pac_id)  LIMIT 1 ")
+    String  getTbTransitionPacId(String cusId);
+
+
+    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE  a.tj_num=#{tjNum} AND a.parent_pro_id=#{proId}")
+    BigDecimal getTbTransitionNewPriceByTjNumAndParentId(@Param("tjNum")String tjNum,@Param("proId")String proId);
+
+
+    @Select("SELECT SUM(a.ord_price) FROM tb_transition a WHERE  a.tj_num=#{tjNum} AND a.parent_pro_id=#{proId}")
+    BigDecimal getTbTransitionOrdPriceByTjNumAndParentId(@Param("tjNum")String tjNum,@Param("proId")String proId);
 }

--
Gitblit v1.8.0