|
|
|
@@ -44,6 +44,7 @@ import com.iformall.service.WxPayAccountBillService; |
|
|
|
import com.iformall.service.WxShopService; |
|
|
|
import com.iformall.service.helper.WxBillAllHelper; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
|
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -127,6 +128,9 @@ 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()) { |
|
|
|
@@ -205,6 +209,9 @@ 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()); |
|
|
|
|