diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 671256c4a..c0e942c8d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -143,55 +144,91 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { WxBillDeposit wxBillRent = new WxBillDeposit(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); + + WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); + wxBillOtherDeposit.setId(bill.getBillId()); + if(freezeStatus != null) wxBillOtherDeposit.setFreeze(freezeStatus); + if(status != null){ + wxBillOtherDeposit.setStatus(status); + wxBillOtherDeposit.setPayDate(new Date()); + } + wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); + }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { WxBillOther wxBillRent = new WxBillOther(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); WxMerchantSubsidy wxMerchantSubsidy = new WxMerchantSubsidy(); wxMerchantSubsidy.setId(bill.getBillId()); if(freezeStatus != null) wxMerchantSubsidy.setFreeze(freezeStatus); - if(status != null) wxMerchantSubsidy.setStatus(status); + if(status != null){ + wxMerchantSubsidy.setStatus(status); + } wxMerchantSubsidyMapper.updateByPrimaryKeySelective(wxMerchantSubsidy); }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); }else{ WxBillDaily wxBillRent = new WxBillDaily(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); - if(status != null) wxBillRent.setStatus(status); + if(status != null){ + wxBillRent.setStatus(status); + wxBillRent.setPayDate(new Date()); + } wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 3a05f32b3..3616057a7 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -291,7 +291,7 @@ union all select s.settle_number,s.id,s.merchant_id,'' shop_id,s.tenant_id,'结算单' name, 10 bill_type_value,'结算单' bill_type,0 need_pay, - ((select IFNULL(sum(bill.receive_pay),0) from wx_bill_settle_bill bb left join + ((select IFNULL(sum(bill.owe),0) from wx_bill_settle_bill bb left join (select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent where is_preview = 0 union all @@ -330,7 +330,7 @@ ) bill on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=0) - - (select IFNULL(sum(bill.receive_pay),0) from wx_bill_settle_bill bb left join + (select IFNULL(sum(bill.owe),0) from wx_bill_settle_bill bb left join (select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent where is_preview = 0 union all @@ -381,7 +381,6 @@ left join wx_pay_bill pb on bill.id=pb.bill_id where 1=1 - and bill.id=#{id} diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml index 137cb39f8..cd8680eaf 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml @@ -34,7 +34,7 @@ and tt.createtime <= #{endtime} and tt.`settle_number` = #{settleNumber} - and tt.`status` = #{status} + and tt.`status` = #{status} and tt.`apply_status` = #{applyStatus} and (tt.receiveMoney-tt.payMoney- @@ -55,7 +55,7 @@ (select IFNULL(sum(settle_money),0) from wx_bill_settle_record where settle_id = tt.id) ) balance from ( select s.*,m.name merchantName, - (select IFNULL(sum(bill.receive_pay),0) from wx_bill_settle_bill bb left join + (select IFNULL(sum(bill.owe),0) from wx_bill_settle_bill bb left join (select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent where is_preview = 0 union all @@ -91,7 +91,7 @@ ) bill on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=0 ) receiveMoney, - (select IFNULL(sum(bill.receive_pay),0) from wx_bill_settle_bill bb left join + (select IFNULL(sum(bill.owe),0) from wx_bill_settle_bill bb left join (select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent where is_preview = 0 union all