ソースを参照

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter 1年前
コミット
4ef5c1c556
3個のファイルの変更10行の追加13行の削除
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java
  2. +4
    -13
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java
  3. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 1
- 0
mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java ファイルの表示

@@ -22,6 +22,7 @@ public class PrintCustomedTableDataHandler{
for (Iterator<String> it = entity.keySet().iterator(); it.hasNext();) {
String fieldName = it.next();
//Object o = entity.get(fieldName);
System.out.println(">>>>>>>>>>"+fieldName);
if (StringUtils.isBlank(fieldName)) {
}else {
Object o = objectParser.getObjectValue(fieldName, object,params);


+ 4
- 13
mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java ファイルの表示

@@ -31,7 +31,6 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{
public Object getObjectValue(String name, Object o, Object... params) {
Map<Long, WxMerchant> merchantMap = (Map<Long, WxMerchant>) params[0];
Map<Long, WxEnergyFees> feesMap = (Map<Long, WxEnergyFees>) params[1];
Map<Long,String> shopNumber = (Map<Long, String>) params[2];
WxFinanceReceive receive = (WxFinanceReceive) o;
if (name.equals("id")) {
return receive.getId();
@@ -72,15 +71,10 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{
return receive.getMoneyDetail();
}else if (name.equals("remark")) {
return receive.getRemark();
}else if (name.equals("merchantName")) {
if (null != merchantMap) {
WxMerchant m = merchantMap.get(receive.getMerchantId());
if (null != m) {
return m.getName();
}
}else if (name.equals("merchantId") || name.equals("merchantName")) {
if (StringUtils.isNotBlank(receive.getMerchantName())) {
return receive.getMerchantName();
}
return "";
}else if (name.equals("merchantId")) {
if (null != merchantMap) {
WxMerchant m = merchantMap.get(receive.getMerchantId());
if (null != m) {
@@ -89,10 +83,7 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{
}
return "";
}else if (name.equals("shopNumber")) {
if (null != shopNumber) {
return shopNumber.get(receive.getMerchantId());
}
return "";
return receive.getShopNumber();
}
return null;
}


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java ファイルの表示

@@ -273,6 +273,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
WxFinanceReceiveBill rb = new WxFinanceReceiveBill();
rb.updateTenantInfo(re);
rb.setReceiveId(re.getId());
if (null != shopNumber && null != re.getMerchantId()) {
re.setShopNumber(shopNumber.get(re.getMerchantId()));
}else {
re.setShopNumber("");
}
List<WxFinanceReceiveBill> rbills = wxFinanceService.getReceiveBills(rb);
PrintVo vo = handleComponentData(re.getId(),templateId,o,items, printFinanceReceiveDataHandler,re,printReceiveBillDataHandler, rbills,merchantMap,feesMap,shopNumber);
if (null != vo) {


読み込み中…
キャンセル
保存