|
|
|
@@ -1084,22 +1084,34 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
record.setBillType(fees.getBillType()); |
|
|
|
WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); |
|
|
|
if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) { |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE); |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE,record.getReceivePay(),"0"); |
|
|
|
}else if (fees.getBillType().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT); |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT,record.getReceivePay(),"0"); |
|
|
|
}else if (fees.getBillType().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.OTHER); |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.OTHER,record.getReceivePay(),"0"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType) { |
|
|
|
@Override |
|
|
|
public void createTempToPay(WxAllBill record,MallUserInfo user) { |
|
|
|
WxEnergyFees fees = wxEnergyService.getFeesById(record.getEnergyFeesId(),record.getTenantId()) ; |
|
|
|
record.setBillType(fees.getBillType()); |
|
|
|
WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); |
|
|
|
if (fees.getBillType().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT,"0",record.getReceivePay()); |
|
|
|
}else if (fees.getBillType().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { |
|
|
|
generateTempBill(record, merchant, user,EnumBillAllType.OTHER,"0",record.getReceivePay()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType,String receivePay,String pay) { |
|
|
|
WxAllBill advanceBill = new WxAllBill(); |
|
|
|
advanceBill.updateTenantInfo(record); |
|
|
|
advanceBill.setMerchantId(merchant.getId()); |
|
|
|
advanceBill.setRentShopType(merchant.getRentShopType()); |
|
|
|
advanceBill.setNeedPay(record.getReceivePay()); |
|
|
|
advanceBill.setReceivePay(record.getReceivePay()); |
|
|
|
advanceBill.setPay("0"); |
|
|
|
advanceBill.setReceivePay(receivePay); |
|
|
|
advanceBill.setPay(pay); |
|
|
|
advanceBill.setUseMoney("0"); |
|
|
|
advanceBill.setBillType(billType.getCode()); |
|
|
|
//advanceBill.setPayWay(); |
|
|
|
|