diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java index eed5071c4..2f9a28072 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFeesStandardsController.java @@ -50,6 +50,7 @@ public class WxFeesStandardsController extends BaseController { } record.updateTenantInfo(getTenantInfo()); record.setBillType(EnumBillAllType.PROPERTY.getCode()); + record.setIsDel(EnumYesOrNo.NO.getCode()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); return new ResultData(page); 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 6f8f7ae22..bf4a7f358 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -23,11 +23,23 @@ public class WxBillSum implements Serializable { private String needPay = "0"; @TableField(exist = false) private BigDecimal needPayNumber; + @TableField(exist = false) + private String taxNeedPay; + public String getTaxNeedPay() { + if (StringUtils.isNotBlank(taxRate)) { + taxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).divide(new BigDecimal(100)).setScale(6,BigDecimal.ROUND_HALF_UP).toPlainString(); + }else { + taxNeedPay = ""; + } + return taxNeedPay; + } + @TableField(exist = false) private String noTaxNeedPay = "0"; public String getNoTaxNeedPay() { - if (StringUtils.isNotBlank(taxRate)) { - noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString(); + String taxpay = getTaxNeedPay(); + if (StringUtils.isNotBlank(taxpay)) { + noTaxNeedPay = new BigDecimal(needPay).subtract(new BigDecimal(taxpay)).setScale(6,BigDecimal.ROUND_HALF_UP).toPlainString(); 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 1f96900cd..e7aa89fc5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -76,6 +76,11 @@ public class WxMerchantBillVo implements Serializable { @Excel(name = "账单最大日期",format="yyyy-MM-dd", width = 20, orderNum = "8") private Date maxDate; + @TableField(exist = false) + private String cusName; + @TableField(exist = false) + private String cusPhone; + @TableField(exist = false) private List billSumList; @TableField(exist = false) 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 503a65eae..3f9860664 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 @@ -51,6 +51,10 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{ } } return ""; + }else if (name.equals("cusName")) { + return receive.getCusName(); + }else if (name.equals("cusPhone")) { + return receive.getCusPhone(); } return null; } diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java index 0694f54a0..b3ed58f92 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java @@ -37,6 +37,8 @@ public class PrintMerchantSettleItemDataHandler implements PrintDataParser{ return receive.getNeedPay(); }else if (name.equals("noTaxNeedPay")) { return receive.getNoTaxNeedPay(); + }else if (name.equals("taxNeedPay")) { + return receive.getTaxNeedPay(); }else if (name.equals("paid")) { return receive.getPaid(); }else if (name.equals("owe")) { 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 4d94b5b32..e3bfb9420 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -337,6 +337,19 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setPaid(payTotal.toPlainString()); bq.setOwe(oweTotal.toPlainString()); bq.setCurrentTime(new Date()); + if (null != merchantMap && null != bq.getMerchantId()) { + WxMerchant merchant = merchantMap.get(bq.getMerchantId()); + if (null != merchant) { + bq.setCusName(merchant.getLinkPerson()); + bq.setCusPhone(merchant.getLinkPhone()); + }else { + bq.setCusName(""); + bq.setCusPhone(""); + } + }else { + bq.setCusName(""); + bq.setCusPhone(""); + } PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); if (null != vo) { voList.add(vo); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 0ec9d9abb..498a3016c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -544,20 +544,22 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillDeposit.setReceivePay(needpay); //wxBillDeposit.setOwe(needpay); Date date = new Date(); - Calendar instance = Calendar.getInstance(); - instance.setTime(wxPropertyContract.getRentalStartDate()); - instance.add(Calendar.DAY_OF_MONTH, -1); - Date time = instance.getTime(); - //账单开始时间 - instance.clear(); - instance.setTime(time); - instance.add(Calendar.DAY_OF_MONTH, 1); - wxBillDeposit.setStarttime(instance.getTime()); - //账单结束时间 - instance.clear(); - instance.setTime(time); - instance.add(dayType, wxPropertyContract.getLease()); - wxBillDeposit.setEndtime(instance.getTime()); +// Calendar instance = Calendar.getInstance(); +// instance.setTime(wxPropertyContract.getRentalStartDate()); +// instance.add(Calendar.DAY_OF_MONTH, -1); +// Date time = instance.getTime(); +// //账单开始时间 +// instance.clear(); +// instance.setTime(time); +// instance.add(Calendar.DAY_OF_MONTH, 1); +// wxBillDeposit.setStarttime(instance.getTime()); + wxBillDeposit.setStarttime(record.getFirstBillDateStart()); +// //账单结束时间 +// instance.clear(); +// instance.setTime(time); +// instance.add(dayType, wxPropertyContract.getLease()); +// wxBillDeposit.setEndtime(instance.getTime()); + wxBillDeposit.setEndtime(record.getFirstBillDateEnd()); wxBillDeposit.setStatus(EnumBillStatus.WAIT_PAY.getCode()); wxBillDeposit.updateTenantInfo(wxPropertyContract); wxBillDeposit.setMerchantId(record.getMerchantId());