|
|
|
@@ -4,6 +4,7 @@ import java.util.Map; |
|
|
|
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; |
|
|
|
import com.iformall.domain.po.WxAllBill; |
|
|
|
import com.iformall.domain.po.WxEnergyFees; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
@@ -58,6 +59,9 @@ public class PrintBillDataHandler implements PrintDataParser{ |
|
|
|
} |
|
|
|
return ""; |
|
|
|
}else if (name.equals("feesName")) { |
|
|
|
if (StringUtils.isNotBlank(receive.getEnergyFeesName())) { |
|
|
|
return receive.getEnergyFeesName(); |
|
|
|
} |
|
|
|
if (null != feesMap && null != receive.getEnergyFeesId()) { |
|
|
|
WxEnergyFees f = feesMap.get(receive.getEnergyFeesId()); |
|
|
|
if (null != f) { |
|
|
|
@@ -68,6 +72,9 @@ public class PrintBillDataHandler implements PrintDataParser{ |
|
|
|
}else if (name.equals("billRemark")) { |
|
|
|
return receive.getBillRemark(); |
|
|
|
}else if (name.equals("shopNumber")) { |
|
|
|
if (StringUtils.isNotBlank(receive.getShopNumber())) { |
|
|
|
return receive.getShopNumber(); |
|
|
|
} |
|
|
|
if (null != shopNumber && null != receive.getMerchantId()) { |
|
|
|
String m = shopNumber.get(receive.getMerchantId()); |
|
|
|
return m; |
|
|
|
|