wuxw 5 роки тому
батько
коміт
648eeedba1

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/fee/BillOweFeeDto.java

@@ -34,6 +34,7 @@ public class BillOweFeeDto extends PageDto implements Serializable {
     private String[] ownerIds;
     private String deadlineTime;
     private String payObjId;
+    private String curBill;
 
 
     public String getOweId() {
@@ -171,4 +172,12 @@ public class BillOweFeeDto extends PageDto implements Serializable {
     public void setPayObjId(String payObjId) {
         this.payObjId = payObjId;
     }
+
+    public String getCurBill() {
+        return curBill;
+    }
+
+    public void setCurBill(String curBill) {
+        this.curBill = curBill;
+    }
 }

+ 3 - 1
java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml

@@ -466,7 +466,9 @@
         t.deadline_time deadlineTime,
         pf.payer_obj_id payObjId
         from bill_owe_fee t
-        inner join bill b on t.bill_id = b.bill_id and b.community_id = t.community_id and b.cur_bill = 'T'
+        <if test="curBill !=null and curBill != ''">
+        inner join bill b on t.bill_id = b.bill_id and b.community_id = t.community_id and b.cur_bill = #{curBill}
+        </if>
         left join pay_fee pf on t.fee_id = pf.fee_id and t.community_id = pf.community_id and pf.status_cd = '0'
         where 1 =1
         <if test="oweId !=null and oweId != ''">

+ 1 - 0
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java

@@ -143,6 +143,7 @@ public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz {
         billOweFeeDto.setCommunityId(weChatDto.getObjId());
         billOweFeeDto.setOwnerIds(memberIds);
         billOweFeeDto.setState("1000");
+        billOweFeeDto.setCurBill("T");
         List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
 
         String url = sendMsgUrl + accessToken;