|
|
|
@@ -734,7 +734,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
} |
|
|
|
|
|
|
|
++billcount; |
|
|
|
WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal); |
|
|
|
WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal,""); |
|
|
|
wxBillProperty.setUnFixedbillFeesStandardsList(unFixedList); |
|
|
|
|
|
|
|
resultList.add(wxBillProperty); |
|
|
|
@@ -773,11 +773,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
|
|
|
|
private WxBillProperty generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Long userId,WxBillFeesStandardsListVo svo, |
|
|
|
Integer billcount,Map<String, Object> shopInfo) { |
|
|
|
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0"); |
|
|
|
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0",svo.getBillName()); |
|
|
|
} |
|
|
|
|
|
|
|
private WxBillProperty generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay, |
|
|
|
Long userId,Integer billcount,Map<String, Object> shopInfo,String standarsTotal) { |
|
|
|
Long userId,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark) { |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
wxBillProperty.setIsPreview(isPreview); |
|
|
|
@@ -810,7 +810,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
} |
|
|
|
wxBillProperty.setLatePayRatio(0); |
|
|
|
wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString()); |
|
|
|
|
|
|
|
wxBillProperty.setComments(remark); |
|
|
|
|
|
|
|
//计算手续费 |
|
|
|
BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); |
|
|
|
|