|
|
|
@@ -272,7 +272,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
billq.setIds(billIdList); |
|
|
|
billList = wxAllBillService.list(billq); |
|
|
|
} |
|
|
|
PrintVo vo = handleComponentData(templateId,o,items, printFinanceReceiveDataHandler,re,printBillDataHandler, billList,merchantMap,feesMap,feesMap); |
|
|
|
PrintVo vo = handleComponentData(templateId,o,items, printFinanceReceiveDataHandler,re,printBillDataHandler, billList,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != vo) { |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
@@ -289,7 +289,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,feesMap); |
|
|
|
PrintVo vo = handleComponentData(templateId,o,items, printBillDataHandler,re,null, null,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != vo) { |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
@@ -332,7 +332,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,feesMap); |
|
|
|
PrintVo vo = handleComponentData(templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleDataHandler, sumlist,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != vo) { |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
|