| @@ -472,8 +472,21 @@ public class WxCouponOrderController extends BaseController { | |||||
| WxCouponOrder updateCouponOrder = new WxCouponOrder(); | WxCouponOrder updateCouponOrder = new WxCouponOrder(); | ||||
| updateCouponOrder.setId(couponOrder.getId()); | updateCouponOrder.setId(couponOrder.getId()); | ||||
| if(EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ | if(EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ | ||||
| updateCouponOrder.setShippingStatus(EnumOrderShopingStatus.READY_SELF_MENTION.getCode()); | |||||
| if(EnumOrderShopingStatus.WAIT_SELF_MENTION.getCode().equals(couponOrder.getShippingStatus())){ | |||||
| return new ResultData(ErrorCode.COUPON_GOODS_STATUS_NOT_SUPPORTED.getCode(),"已备货,待自提"); | |||||
| } | |||||
| if(EnumOrderShopingStatus.ALREADY_SELF_MENTION.getCode().equals(couponOrder.getShippingStatus())){ | |||||
| return new ResultData(ErrorCode.COUPON_GOODS_STATUS_NOT_SUPPORTED.getCode(),"已自提"); | |||||
| } | |||||
| updateCouponOrder.setShippingStatus(EnumOrderShopingStatus.WAIT_SELF_MENTION.getCode()); | |||||
| }else if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ | }else if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ | ||||
| if(EnumOrderShopingStatus.WAIT_DISTRIBUTION.getCode().equals(couponOrder.getShippingStatus())){ | |||||
| return new ResultData(ErrorCode.COUPON_GOODS_STATUS_NOT_SUPPORTED.getCode(),"已发货,待收货"); | |||||
| } | |||||
| if(EnumOrderShopingStatus.ALREADY_DISTRIBUTION.getCode().equals(couponOrder.getShippingStatus())){ | |||||
| return new ResultData(ErrorCode.COUPON_GOODS_STATUS_NOT_SUPPORTED.getCode(),"已收货"); | |||||
| } | |||||
| if(StringUtils.isBlank(wxCouponOrder.getDeliveryInfo())){ | if(StringUtils.isBlank(wxCouponOrder.getDeliveryInfo())){ | ||||
| return new ResultData(ErrorCode.COUPON_GOODS_DELIVERY_NULL); | return new ResultData(ErrorCode.COUPON_GOODS_DELIVERY_NULL); | ||||
| } | } | ||||