From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 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 fab994b..b7f5539 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" +
@@ -171,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);
@@ -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" +
@@ -188,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);
@@ -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" +
@@ -221,7 +222,7 @@
"\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);
@@ -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" +
@@ -261,7 +262,7 @@
"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 ")
+ "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);
@@ -275,7 +276,7 @@
// 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);
+ 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 " +
@@ -354,4 +355,13 @@
@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);
}
--
Gitblit v1.8.0