Bläddra i källkod

[修改][结算单][修改商户账单列表]

release_toaliyun_real
luozukai 6 år sedan
förälder
incheckning
0a2c2c88d4
3 ändrade filer med 51 tillägg och 15 borttagningar
  1. +46
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
  2. +2
    -3
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
  3. +3
    -3
      mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml

+ 46
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java Visa fil

@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;


@@ -143,55 +144,91 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
WxBillRent wxBillRent = new WxBillRent(); WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setId(bill.getBillId()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent);
}else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillDeposit wxBillRent = new WxBillDeposit(); WxBillDeposit wxBillRent = new WxBillDeposit();
wxBillRent.setId(bill.getBillId()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); 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())) { }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) {
WxBillProperty wxBillRent = new WxBillProperty(); WxBillProperty wxBillRent = new WxBillProperty();
wxBillRent.setId(bill.getBillId()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent);


WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
propertyDeposit.setId(bill.getBillId()); propertyDeposit.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit);
}else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) {
WxBillOther wxBillRent = new WxBillOther(); WxBillOther wxBillRent = new WxBillOther();
wxBillRent.setId(bill.getBillId()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent);
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit();
wxBillRent.setId(bill.getBillId()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);


WxMerchantSubsidy wxMerchantSubsidy = new WxMerchantSubsidy(); WxMerchantSubsidy wxMerchantSubsidy = new WxMerchantSubsidy();
wxMerchantSubsidy.setId(bill.getBillId()); wxMerchantSubsidy.setId(bill.getBillId());
if(freezeStatus != null) wxMerchantSubsidy.setFreeze(freezeStatus); if(freezeStatus != null) wxMerchantSubsidy.setFreeze(freezeStatus);
if(status != null) wxMerchantSubsidy.setStatus(status);
if(status != null){
wxMerchantSubsidy.setStatus(status);
}
wxMerchantSubsidyMapper.updateByPrimaryKeySelective(wxMerchantSubsidy); wxMerchantSubsidyMapper.updateByPrimaryKeySelective(wxMerchantSubsidy);
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) {
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit();
wxBillRent.setId(bill.getBillId()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);
}else{ }else{
WxBillDaily wxBillRent = new WxBillDaily(); WxBillDaily wxBillRent = new WxBillDaily();
wxBillRent.setId(bill.getBillId()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); 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); wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent);
} }
} }


+ 2
- 3
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Visa fil

@@ -291,7 +291,7 @@


union all 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 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,'租金' (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 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 union all
@@ -330,7 +330,7 @@
) bill ) bill
on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=0) 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,'租金' (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 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 union all
@@ -381,7 +381,6 @@
left join wx_pay_bill pb on bill.id=pb.bill_id left join wx_pay_bill pb on bill.id=pb.bill_id
where 1=1 where 1=1



<if test=" null != id "> <if test=" null != id ">
and bill.id=#{id} and bill.id=#{id}
</if> </if>


+ 3
- 3
mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml Visa fil

@@ -34,7 +34,7 @@
and tt.createtime &lt;= #{endtime} and tt.createtime &lt;= #{endtime}
</if> </if>
<if test=" null != settleNumber and settleNumber !='' ">and tt.`settle_number` = #{settleNumber}</if> <if test=" null != settleNumber and settleNumber !='' ">and tt.`settle_number` = #{settleNumber}</if>
<if test=" null != status and status !=''">and tt.`status` = #{status}</if>
<if test=" null != status">and tt.`status` = #{status}</if>
<if test=" null != applyStatus">and tt.`apply_status` = #{applyStatus}</if> <if test=" null != applyStatus">and tt.`apply_status` = #{applyStatus}</if>
<if test="0 == direction"> <if test="0 == direction">
and (tt.receiveMoney-tt.payMoney- 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) (select IFNULL(sum(settle_money),0) from wx_bill_settle_record where settle_id = tt.id)
) balance from ( ) balance from (
select s.*,m.name merchantName, 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,'租金' (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 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 union all
@@ -91,7 +91,7 @@
) bill ) bill
on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=0 on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=0
) receiveMoney, ) 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,'租金' (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 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 union all


Laddar…
Avbryt
Spara