| @@ -28,8 +28,9 @@ public class WxBillSum implements Serializable { | |||||
| public String getNoTaxNeedPay() { | public String getNoTaxNeedPay() { | ||||
| if (StringUtils.isNotBlank(taxRate)) { | if (StringUtils.isNotBlank(taxRate)) { | ||||
| noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString(); | noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString(); | ||||
| return noTaxNeedPay; | |||||
| } | } | ||||
| return noTaxNeedPay; | |||||
| return needPay; | |||||
| } | } | ||||
| @@ -78,6 +78,8 @@ public class WxMerchantBillVo implements Serializable { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<WxBillSum> billSumList; | private List<WxBillSum> billSumList; | ||||
| @TableField(exist = false) | |||||
| private Date currentTime; | |||||
| } | } | ||||
| @@ -30,7 +30,7 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ | |||||
| }else if (name.equals("returnPay")) { | }else if (name.equals("returnPay")) { | ||||
| return receive.getReturnPay(); | return receive.getReturnPay(); | ||||
| }else if (name.equals("currentTime")) { | }else if (name.equals("currentTime")) { | ||||
| return DateUtils.date2String(new Date(),DateUtils.DATE_PATTERN); | |||||
| return DateUtils.date2String(receive.getCurrentTime(),DateUtils.DATE_PATTERN); | |||||
| }else if (name.equals("owe")) { | }else if (name.equals("owe")) { | ||||
| return receive.getOwe(); | return receive.getOwe(); | ||||
| }else if (name.equals("paid")) { | }else if (name.equals("paid")) { | ||||
| @@ -38,7 +38,7 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ | |||||
| }else if (name.equals("needPay")) { | }else if (name.equals("needPay")) { | ||||
| return receive.getNeedPay(); | return receive.getNeedPay(); | ||||
| }else if (name.equals("needPayChinese")) { | }else if (name.equals("needPayChinese")) { | ||||
| return receive.getNeedPay(); | |||||
| return receive.getNeedPayChinese(); | |||||
| }else if (name.equals("shopNumber")) { | }else if (name.equals("shopNumber")) { | ||||
| return receive.getShopNumber(); | return receive.getShopNumber(); | ||||
| }else if (name.equals("merchantName")) { | }else if (name.equals("merchantName")) { | ||||
| @@ -336,6 +336,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| bq.setNeedPay(receiveTotal.toPlainString()); | bq.setNeedPay(receiveTotal.toPlainString()); | ||||
| bq.setPaid(payTotal.toPlainString()); | bq.setPaid(payTotal.toPlainString()); | ||||
| bq.setOwe(oweTotal.toPlainString()); | bq.setOwe(oweTotal.toPlainString()); | ||||
| bq.setCurrentTime(new Date()); | |||||
| PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); | PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); | ||||
| if (null != vo) { | if (null != vo) { | ||||
| voList.add(vo); | voList.add(vo); | ||||