From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 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 73d6e78..8a9c740 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
@@ -69,6 +69,14 @@
     public boolean deletedTbTransitionByCusId(String cusId);
 
 
+    @Delete("DELETE  FROM tb_transition WHERE tj_num=#{tjNum}")
+    public boolean deletedTbTransitionByTjNum(String tjNum);
+
+    @Update("UPDATE tb_transition a SET "+
+            "a.tj_num=null" +
+            " WHERE a.tj_num=#{tjNum}")
+    boolean updateTbTransitionByTjNum(String tjNum);
+
     @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId}")
     public List<TbTransition> getTbTransitionListByCusIdAndPac(@Param("cusId") String cusId,@Param("pacId") String pacId);
 
@@ -100,7 +108,7 @@
 
     @Update("UPDATE tb_transition a SET \n" +
             "a.ord_price=a.now_price,\n" +
-            "a.now_price=a.ord_price*#{discount}," +
+            "a.now_price=a.ord_price*(#{discount}/10)," +
             "a.tj_num=#{tjNum}"+
             " WHERE a.cus_id=#{cusId} ")
     boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount,@Param("tjNum")String tjNum);
@@ -118,7 +126,8 @@
             "   now_price,\n" +
             "   create_time,\n" +
             "   pro_check_method,\n" +
-            "   pro_type\n" +
+            "   pro_type,\n" +
+            "   card_id\n" +
             ")\n" +
             "SELECT\n" +
             "\t#{cusId},\n" +
@@ -128,11 +137,12 @@
             "\tc.pro_name,\n" +
             "\tb.pro_id,\n" +
             "\tb.pro_name,\n" +
-            "\tTRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),\n" +
-            "\tTRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),\n" +
+            "\tTRUNCATE(c.pro_price,2),\n" +
+            " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
             "\tSYSDATE(),\n" +
             "\tc.pro_check_method,\n" +
-            "\tIFNULL(c.pro_type,'')\n" +
+            "\tIFNULL(c.pro_type,''),\n" +
+            "\t#{cardId}\n" +
             "FROM\n" +
             "\ttj_package_project a\n" +
             "\tLEFT JOIN tj_project b ON a.pro_id = b.pro_id\n" +
@@ -140,15 +150,16 @@
             "\tLEFT JOIN tj_package d ON a.pac_id=d.pac_id\n" +
             "\t\n" +
             "\tWHERE a.pac_id=#{pacId} and c.deleted=0")
-    void saveRedisTransitionByPacId(@Param("cusId") String cusId,@Param("pacId") Long pacId);
+    void saveRedisTransitionByPacId(@Param("cusId") String cusId,@Param("cardId")String cardId,@Param("pacId") Long pacId);
 
 
     @Insert("INSERT INTO tb_transition \n" +
-            "(cus_id, pro_id, pro_name, parent_pro_id, parent_pro_name, ord_price, now_price, create_time, pro_check_method, pro_type ) \n" +
+            "(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" +
-            "IFNULL ( a.pro_type, '' ) \n" +
+            "IFNULL ( a.pro_type, '' ), \n" +
+            "#{cardId}\n" +
             "FROM\n" +
             "\ttj_project a\n" +
             "\tLEFT JOIN \n" +
@@ -156,7 +167,7 @@
             "\tON a.pro_parent_id = b.pro_id \n" +
             "WHERE\n" +
             "\ta.pro_id = #{proId}")
-    void saveRedisTransitionByProId(@Param("cusId")String cusId,@Param("proId") Long proId);
+    void saveRedisTransitionByProId(@Param("cusId")String cusId,@Param("cardId")String cardId,@Param("proId") Long proId);
 
 
     @Insert("INSERT INTO tb_transition(\n" +
@@ -211,4 +222,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}")
+    BigDecimal getTbTransitionDxPriceByPac(@Param("cusId")String cusId,@Param("proId")Long proId,@Param("cardId")String cardId,@Param("pacId")Long pacId);
 }

--
Gitblit v1.8.0