Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
271633e7bb
3 changed files with 22 additions and 0 deletions
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java
  3. +13
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java View File

@@ -76,6 +76,11 @@ public class WxMerchantBillVo implements Serializable {
@Excel(name = "账单最大日期",format="yyyy-MM-dd", width = 20, orderNum = "8")
private Date maxDate;
@TableField(exist = false)
private String cusName;
@TableField(exist = false)
private String cusPhone;
@TableField(exist = false)
private List<WxBillSum> billSumList;
@TableField(exist = false)


+ 4
- 0
mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java View File

@@ -51,6 +51,10 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{
}
}
return "";
}else if (name.equals("cusName")) {
return receive.getCusName();
}else if (name.equals("cusPhone")) {
return receive.getCusPhone();
}
return null;
}


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

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


Loading…
Cancel
Save