|
|
|
@@ -128,9 +128,6 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
private PageInfo<WxMerchantBillVo> 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<WxMerchant> merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
PageInfo<WxMerchantBillVo> page = new PageInfo<WxMerchantBillVo>(); |
|
|
|
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()); |
|
|
|
} |
|
|
|
|