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/TjFlowingWaterMapper.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
index bf4c625..ad21c5b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -1,11 +1,14 @@
package com.ltkj.hosp.mapper;
+import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjFlowingWater;
import com.ltkj.hosp.domain.TjOrderDetail;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
@@ -70,7 +73,7 @@
" tj_flowing_water b ON a.order_id = b.order_id WHERE a.tj_number =#{tjNum} AND a.deleted='0' AND b.deleted='0'")
List<String> getFlowingWaterIds(String tjNum);
- @Select("\tSELECT a.discount/10 FROM tj_flowing_water a WHERE 1=1 AND a.deleted =0 AND a.order_id=#{orderId} AND a.discount !='/'")
+ @Select("SELECT a.discount/10 FROM tj_flowing_water a WHERE 1=1 AND a.deleted =0 AND a.order_id=#{orderId} AND a.discount !='/'AND a.is_addition='N' AND a.pay_stasus !=2 ")
String getDiscount(String orderId);
@@ -81,4 +84,19 @@
@Select("SELECT GROUP_CONCAT(a.pro_name ) proname FROM tj_charging_standard a WHERE a.tj_num=#{orderId}")
String getproNameByOrderId(String orderId);
+
+
+ @Select("\n" +
+ "SELECT a.tj_serial_number FROM tj_flowing_water a " +
+ "WHERE a.deleted=0 " +
+ "AND a.toll_collector_id=#{userId}" +
+ "AND ISNULL(a.is_checkout)" +
+ "AND a.pay_stasus !=0 " +
+ "AND a.update_time BETWEEN #{beginTime} AND #{endTime}")
+ List<Long> getFlowingWaterIdList(@Param("userId") String userId,@Param("beginTime") Date beginTime,@Param("endTime") Date endTime);
+
+ @Delete(" delete" +
+ " from tj_flowing_water" +
+ " where order_id = #{order}")
+ public int deleteTjFlowingWaterByOrderId(String order);
}
--
Gitblit v1.8.0