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