diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index cf746d2ab..225960ec9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAppinfo; @@ -17,6 +18,8 @@ import com.iformall.exception.MallinkException; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxRefundOrderService; +import com.iformall.utils.AlipayMsgPage; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -29,6 +32,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.PrintWriter; import java.util.Map; @RestController @@ -59,6 +65,11 @@ public class WxCouponOrderController extends BaseController { wxCouponOrder.getMerchantName().isEmpty()) { wxCouponOrder.setMerchantName(null); } + if (null == wxCouponOrder.getStartDate() && null == wxCouponOrder.getEndDate() + && null == wxCouponOrder.getVerifyStartDate() && null == wxCouponOrder.getVerifyEndDate()) { + return new ResultData(Result.ERROR,"交易时间和核销时间请至少选择一个"); + } + return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } @@ -142,6 +153,18 @@ public class WxCouponOrderController extends BaseController { wxCouponOrder.getMerchantName().isEmpty()) { wxCouponOrder.setMerchantName(null); } + if (null == wxCouponOrder.getStartDate() && null == wxCouponOrder.getEndDate() + && null == wxCouponOrder.getVerifyStartDate() && null == wxCouponOrder.getVerifyEndDate()) { + PrintWriter out; + try { + response.setContentType("text/html;charset=utf-8"); + out = response.getWriter(); + out.print("
交易时间和核销时间请至少选择一个
"); + out.close(); + } catch (IOException e) { + logger.error(" alipayCallback writeResponse error.",e); + } + } wxCouponOrderService.exportData(false,wxCouponOrder, request, response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 0ad378c6b..5afe63030 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1241,17 +1241,22 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { private void handleWxCouponOrderBVoQueryParam(WxCouponOrderBVo wxCouponOrder) { - if(null == wxCouponOrder.getStartDate()) { - wxCouponOrder.setStartDate(DateUtils.getFirstDayForCurrMonth()); +// if(null == wxCouponOrder.getStartDate()) { +// wxCouponOrder.setStartDate(DateUtils.getFirstDayForCurrMonth()); +// } + + if (null != wxCouponOrder.getStartDate()) { + wxCouponOrder.setStartDateTimes(wxCouponOrder.getStartDate().getTime()); + wxCouponOrder.setStartDate(null); } - wxCouponOrder.setStartDateTimes(wxCouponOrder.getStartDate().getTime()); - wxCouponOrder.setStartDate(null); - if(null == wxCouponOrder.getEndDate()) { - wxCouponOrder.setEndDate(DateUtils.getLastDayForMonth(new Date())); +// if(null == wxCouponOrder.getEndDate()) { +// wxCouponOrder.setEndDate(DateUtils.getLastDayForMonth(new Date())); +// } + if (null != wxCouponOrder.getEndDate()) { + wxCouponOrder.setEndDateTimes(wxCouponOrder.getEndDate().getTime()); + wxCouponOrder.setEndDate(null); } - wxCouponOrder.setEndDateTimes(wxCouponOrder.getEndDate().getTime()); - wxCouponOrder.setEndDate(null); String cuserPhone = StringUtils.trimToNull(wxCouponOrder.getcuserPhone()); if (null != cuserPhone) {