| @@ -23,7 +23,10 @@ public class PrintBillDataHandler implements PrintDataParser{ | |||||
| if (name.equals("id")) { | if (name.equals("id")) { | ||||
| return receive.getId(); | return receive.getId(); | ||||
| }else if (name.equals("createtime")) { | }else if (name.equals("createtime")) { | ||||
| return DateUtils.date2String(receive.getCreatetime()); | |||||
| if (null != receive.getCreatetime()) { | |||||
| return DateUtils.date2String(receive.getCreatetime()); | |||||
| } | |||||
| return ""; | |||||
| }else if (name.equals("receivePay")) { | }else if (name.equals("receivePay")) { | ||||
| return receive.getReceivePay(); | return receive.getReceivePay(); | ||||
| }else if (name.equals("pay")) { | }else if (name.equals("pay")) { | ||||
| @@ -33,15 +36,21 @@ public class PrintBillDataHandler implements PrintDataParser{ | |||||
| }else if (name.equals("returnPay")) { | }else if (name.equals("returnPay")) { | ||||
| return receive.getReturnPay(); | return receive.getReturnPay(); | ||||
| }else if (name.equals("starttime")) { | }else if (name.equals("starttime")) { | ||||
| return DateUtils.date2String(receive.getStarttime(),DateUtils.DATE_PATTERN); | |||||
| if (null != receive.getStarttime()) { | |||||
| return DateUtils.date2String(receive.getStarttime(),DateUtils.DATE_PATTERN); | |||||
| } | |||||
| return ""; | |||||
| }else if (name.equals("endtime")) { | }else if (name.equals("endtime")) { | ||||
| return DateUtils.date2String(receive.getEndtime(),DateUtils.DATE_PATTERN); | |||||
| if (null != receive.getEndtime()) { | |||||
| return DateUtils.date2String(receive.getEndtime(),DateUtils.DATE_PATTERN); | |||||
| } | |||||
| return ""; | |||||
| }else if (name.equals("owe")) { | }else if (name.equals("owe")) { | ||||
| return receive.getOwe(); | return receive.getOwe(); | ||||
| }else if (name.equals("statusName")) { | }else if (name.equals("statusName")) { | ||||
| return receive.getStatusName(); | return receive.getStatusName(); | ||||
| }else if (name.equals("merchantName")) { | }else if (name.equals("merchantName")) { | ||||
| if (null != merchantMap) { | |||||
| if (null != merchantMap && null != receive.getMerchantId()) { | |||||
| WxMerchant m = merchantMap.get(receive.getMerchantId()); | WxMerchant m = merchantMap.get(receive.getMerchantId()); | ||||
| if (null != m) { | if (null != m) { | ||||
| return m.getName(); | return m.getName(); | ||||
| @@ -49,7 +58,7 @@ public class PrintBillDataHandler implements PrintDataParser{ | |||||
| } | } | ||||
| return ""; | return ""; | ||||
| }else if (name.equals("feesName")) { | }else if (name.equals("feesName")) { | ||||
| if (null != feesMap) { | |||||
| if (null != feesMap && null != receive.getEnergyFeesId()) { | |||||
| WxEnergyFees f = feesMap.get(receive.getEnergyFeesId()); | WxEnergyFees f = feesMap.get(receive.getEnergyFeesId()); | ||||
| if (null != f) { | if (null != f) { | ||||
| return f.getName(); | return f.getName(); | ||||
| @@ -59,7 +68,7 @@ public class PrintBillDataHandler implements PrintDataParser{ | |||||
| }else if (name.equals("billRemark")) { | }else if (name.equals("billRemark")) { | ||||
| return receive.getBillRemark(); | return receive.getBillRemark(); | ||||
| }else if (name.equals("shopNumber")) { | }else if (name.equals("shopNumber")) { | ||||
| if (null != shopNumber) { | |||||
| if (null != shopNumber && null != receive.getMerchantId()) { | |||||
| String m = shopNumber.get(receive.getMerchantId()); | String m = shopNumber.get(receive.getMerchantId()); | ||||
| return m; | return m; | ||||
| } | } | ||||