diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 29728740f..7b3a2c6e4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -128,9 +128,6 @@ public class WxAllBillController extends BillBaseController { private PageInfo getVoPage(WxMerchant wxMerchant,Integer pageNum, Integer pageSize , Integer billStaus) { Date starttime = wxMerchant.getStarttime(); Date enttime = wxMerchant.getEndtime(); - if (null != enttime) { - enttime = DateUtils.getDayEnd(enttime); - } wxMerchant.setStarttime(null); wxMerchant.setEndtime(null); if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { @@ -142,6 +139,7 @@ public class WxAllBillController extends BillBaseController { wxMerchant.setId(-1L); } } + wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); PageInfo merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); PageInfo page = new PageInfo(); page.setPageNum(pageNum); @@ -209,9 +207,6 @@ public class WxAllBillController extends BillBaseController { wxMerchant.updateTenantInfo(getTenantInfo()); Date starttime = wxMerchant.getStarttime(); Date enttime = wxMerchant.getEndtime(); - if (null != enttime) { - enttime = DateUtils.getDayEnd(enttime); - } wxMerchant.setStarttime(null); wxMerchant.setEndtime(null); WxMerchant m = wxMerchantService.selectById(wxMerchant.getId()); @@ -222,7 +217,7 @@ public class WxAllBillController extends BillBaseController { vo.setMerchantId(m.getId()); vo.setMerchantName(m.getName()); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); - + wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index b36f0fba7..f9e1a2637 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -482,5 +482,7 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) public Integer toPayMerchant; + @TableField(exist = false) + public Integer isPreview; } diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 5fb9ebda2..e322f7278 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -100,6 +100,7 @@ public class WxBillAllHelper { bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); } bill.setToPayMerchant(wxMerchant.getToPayMerchant()); + bill.setIsPreview(wxMerchant.getIsPreview()); } public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) {