|
|
|
@@ -337,6 +337,19 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
bq.setPaid(payTotal.toPlainString()); |
|
|
|
bq.setOwe(oweTotal.toPlainString()); |
|
|
|
bq.setCurrentTime(new Date()); |
|
|
|
if (null != merchantMap && null != bq.getMerchantId()) { |
|
|
|
WxMerchant merchant = merchantMap.get(bq.getMerchantId()); |
|
|
|
if (null != merchant) { |
|
|
|
bq.setCusName(merchant.getLinkPerson()); |
|
|
|
bq.setCusPhone(merchant.getLinkPhone()); |
|
|
|
}else { |
|
|
|
bq.setCusName(""); |
|
|
|
bq.setCusPhone(""); |
|
|
|
} |
|
|
|
}else { |
|
|
|
bq.setCusName(""); |
|
|
|
bq.setCusPhone(""); |
|
|
|
} |
|
|
|
PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); |
|
|
|
if (null != vo) { |
|
|
|
voList.add(vo); |
|
|
|
|