java110-bean/src/main/java/com/java110/dto/payFeeConfigDiscount/PayFeeConfigDiscountDto.java
@@ -32,6 +32,10 @@ private Date endTime; private Date payMaxEndTime; private Date currentTime; private String statusCd = "0"; @@ -123,4 +127,20 @@ public void setEndTime(Date endTime) { this.endTime = endTime; } public Date getPayMaxEndTime() { return payMaxEndTime; } public void setPayMaxEndTime(Date payMaxEndTime) { this.payMaxEndTime = payMaxEndTime; } public Date getCurrentTime() { return currentTime; } public void setCurrentTime(Date currentTime) { this.currentTime = currentTime; } } java110-bean/src/main/java/com/java110/po/payFeeConfigDiscount/PayFeeConfigDiscountPo.java
@@ -12,6 +12,7 @@ private String communityId; private String startTime; private String endTime; private String payMaxEndTime; public String getConfigDiscountId() { return configDiscountId; } @@ -56,4 +57,13 @@ public void setEndTime(String endTime) { this.endTime = endTime; } public String getPayMaxEndTime() { return payMaxEndTime; } public void setPayMaxEndTime(String payMaxEndTime) { this.payMaxEndTime = payMaxEndTime; } } java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@ <!-- 保存费用项折扣信息 add by wuxw 2018-07-03 --> <insert id="savePayFeeConfigDiscountInfo" parameterType="Map"> insert into pay_fee_config_discount( config_discount_id,config_id,discount_id,community_id,start_time,end_time config_discount_id,config_id,discount_id,community_id,start_time,end_time,paymax_end_time ) values ( #{configDiscountId},#{configId},#{discountId},#{communityId},#{startTime},#{endTime} #{configDiscountId},#{configId},#{discountId},#{communityId},#{startTime},#{endTime},#{payMaxEndTime} ) </insert> @@ -19,7 +19,7 @@ <select id="getPayFeeConfigDiscountInfo" parameterType="Map" resultType="Map"> select t.config_discount_id,t.config_discount_id configDiscountId,t.config_id,t.config_id configId,t.status_cd,t.status_cd statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id communityId,fd.discount_name discountName,fd.discount_type discountType,t.start_time startTime,t.end_time endTime communityId,fd.discount_name discountName,fd.discount_type discountType,t.start_time startTime,t.end_time endTime,t.paymax_end_time payMaxEndTime from pay_fee_config_discount t left join fee_discount fd on t.discount_id = fd.discount_id and t.community_id = fd.community_id and fd.status_cd = '0' where 1 =1 @@ -38,6 +38,12 @@ <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> <if test="currentTime !=null "> and t.start_time < #{currentTime} </if> <if test="currentTime !=null "> and t.end_time > #{currentTime} </if> order by t.create_time desc <if test="page != -1 and page != null "> limit #{page}, #{row} service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.Date; import java.util.List; /** @@ -153,6 +154,8 @@ payFeeConfigDiscountDto.setRow(feeDetailDto.getRow()); payFeeConfigDiscountDto.setPage(feeDetailDto.getPage()); payFeeConfigDiscountDto.setCommunityId(feeDetailDto.getCommunityId()); Date currentTime = new Date(); payFeeConfigDiscountDto.setCurrentTime(currentTime); List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos = payFeeConfigDiscountInnerServiceSMOImpl.queryPayFeeConfigDiscounts(payFeeConfigDiscountDto);