diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java index 45dd4a467..6f8f7ae22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -28,8 +28,9 @@ public class WxBillSum implements Serializable { public String getNoTaxNeedPay() { if (StringUtils.isNotBlank(taxRate)) { noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString(); + return noTaxNeedPay; } - return noTaxNeedPay; + return needPay; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index ceb4b49ff..55f0f79ea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -78,6 +78,8 @@ public class WxMerchantBillVo implements Serializable { @TableField(exist = false) private List billSumList; + @TableField(exist = false) + private Date currentTime; } diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java index 4878baa43..503a65eae 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java @@ -30,7 +30,7 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ }else if (name.equals("returnPay")) { return receive.getReturnPay(); }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")) { return receive.getOwe(); }else if (name.equals("paid")) { @@ -38,7 +38,7 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ }else if (name.equals("needPay")) { return receive.getNeedPay(); }else if (name.equals("needPayChinese")) { - return receive.getNeedPay(); + return receive.getNeedPayChinese(); }else if (name.equals("shopNumber")) { return receive.getShopNumber(); }else if (name.equals("merchantName")) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index 7e21ebe0b..f7c554ca6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -336,6 +336,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setNeedPay(receiveTotal.toPlainString()); bq.setPaid(payTotal.toPlainString()); bq.setOwe(oweTotal.toPlainString()); + bq.setCurrentTime(new Date()); PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); if (null != vo) { voList.add(vo);