|
|
|
@@ -193,10 +193,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
return isSetDefaultValue; |
|
|
|
} |
|
|
|
|
|
|
|
private PrintVo handleComponentData(Long templateId,JSONObject templateContent,JSONArray items,PrintDataParser objectParser,Object object,PrintDataParser listParser,List listdata,Object... params) { |
|
|
|
private PrintVo handleComponentData(Long dataId,Long templateId,JSONObject templateContent,JSONArray items,PrintDataParser objectParser,Object object,PrintDataParser listParser,List listdata,Object... params) { |
|
|
|
if (null != items) { |
|
|
|
PrintVo vo = new PrintVo(); |
|
|
|
vo.setDataId(templateId); |
|
|
|
vo.setDataId(dataId); |
|
|
|
for (int j = 0 ; j < items.size() ; j ++) { |
|
|
|
JSONObject ov = items.getJSONObject(j); |
|
|
|
//是否是定制化的表格 |
|
|
|
@@ -278,7 +278,16 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
billList = wxAllBillService.list(billq); |
|
|
|
} |
|
|
|
|
|
|
|
PrintVo vo = handleComponentData(templateId,o,items, printFinanceReceiveDataHandler,re,printBillDataHandler, billList,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != billList) { |
|
|
|
WxAllBill billq = new WxAllBill(); |
|
|
|
billq.setShopNumber("合计"); |
|
|
|
billq.setEnergyFeesName(PriceUtilV2.number2CNMontrayUnit(new BigDecimal(re.getAllReceiveMoney()))); |
|
|
|
billq.setReceivePay(re.getReceiveMoney()); |
|
|
|
billq.setSetOff(re.getSetOffMoney()); |
|
|
|
billList.add(billq); |
|
|
|
} |
|
|
|
|
|
|
|
PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printFinanceReceiveDataHandler,re,printBillDataHandler, billList,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != vo) { |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
@@ -295,7 +304,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
List<PrintVo> voList = new ArrayList<PrintVo>(); |
|
|
|
for (int i = 0 ; i < billAllList.size(); i ++) { |
|
|
|
WxAllBill re = billAllList.get(i); |
|
|
|
PrintVo vo = handleComponentData(templateId,o,items, printBillDataHandler,re,null, null,merchantMap,feesMap,shopNumber); |
|
|
|
PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printBillDataHandler,re,null, null,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != vo) { |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
@@ -338,7 +347,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
owe.setNeedPay(payTotal.toPlainString()); |
|
|
|
sumlist.add(owe); |
|
|
|
|
|
|
|
PrintVo vo = handleComponentData(templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleDataHandler, sumlist,merchantMap,feesMap,shopNumber); |
|
|
|
PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleDataHandler, sumlist,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != vo) { |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
|