|
|
|
@@ -25,7 +25,9 @@ import org.springframework.data.redis.core.RedisTemplate; |
|
|
|
import org.springframework.data.redis.core.ValueOperations; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
@@ -74,11 +76,24 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData goodsList(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { |
|
|
|
if (null == wxCouponOrder) wxCouponOrder = new WxCouponOrder(); |
|
|
|
wxCouponOrder.setMerchantId(getLoginBUser().getMerchantId()); |
|
|
|
wxCouponOrder.setCouponType(EnumCouponType.COUPON_DISTRIBUTION.getCode()); |
|
|
|
final PageInfo<WxCouponOrderBVo> page = wxCouponOrderService.goodsListAsPage(wxCouponOrder, pageNum, pageSize); |
|
|
|
public ResultData goodsList(@ModelAttribute WxCouponOrderBVo wxCouponOrderBvo, Integer pageNum, Integer pageSize) { |
|
|
|
if (null == wxCouponOrderBvo) wxCouponOrderBvo = new WxCouponOrderBVo(); |
|
|
|
wxCouponOrderBvo.setMerchantId(getLoginBUser().getMerchantId()); |
|
|
|
wxCouponOrderBvo.setCouponType(EnumCouponType.COUPON_DISTRIBUTION.getCode()); |
|
|
|
List<Integer> shippingStatuss = new ArrayList<>(); |
|
|
|
if(EnumOrderShopingStatus.WAIT_SENG_GOODS.getCode().equals(wxCouponOrderBvo.getShippingStatus())){ |
|
|
|
shippingStatuss.add(EnumOrderShopingStatus.READY_SELF_MENTION.getCode()); |
|
|
|
shippingStatuss.add(EnumOrderShopingStatus.READY_DISTRIBUTION.getCode()); |
|
|
|
}else if(EnumOrderShopingStatus.SENG_GOODS.getCode().equals(wxCouponOrderBvo.getShippingStatus())){ |
|
|
|
shippingStatuss.add(EnumOrderShopingStatus.WAIT_SELF_MENTION.getCode()); |
|
|
|
shippingStatuss.add(EnumOrderShopingStatus.WAIT_DISTRIBUTION.getCode()); |
|
|
|
}else if(EnumOrderShopingStatus.FINISH_SENG_GOODS.getCode().equals(wxCouponOrderBvo.getShippingStatus())){ |
|
|
|
wxCouponOrderBvo.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); |
|
|
|
} |
|
|
|
if(shippingStatuss.size() > 0){ |
|
|
|
wxCouponOrderBvo.setShippingStatuss(shippingStatuss); |
|
|
|
} |
|
|
|
final PageInfo<WxCouponOrderBVo> page = wxCouponOrderService.goodsListAsPage(wxCouponOrderBvo, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
|