Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
6abe2688db
2 changed files with 4 additions and 4 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java View File

@@ -54,7 +54,7 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{
if (null != merchantMap) {
WxMerchant m = merchantMap.get(receive.getMerchantId());
if (null != m) {
return receive.getRemark();
return m;
}
}
return "";


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java View File

@@ -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);
}


Loading…
Cancel
Save