| @@ -384,7 +384,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @ApiOperation(value = "商品发货", notes = "{\"id\":\"string\", \"deliveryInfo\":\"string\"}") | |||||
| @ApiOperation(value = "商品发货", notes = "{\"id\":\"string\", \"deliveryInfo\":\"jsonString\"}") | |||||
| @PostMapping("/sendGoods") | @PostMapping("/sendGoods") | ||||
| public ResultData sendGoods(@RequestBody WxCouponOrder wxCouponOrder) { | public ResultData sendGoods(@RequestBody WxCouponOrder wxCouponOrder) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::postpone"); | logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::postpone"); | ||||
| @@ -397,6 +397,9 @@ public class WxCouponOrderController extends BaseController { | |||||
| if(couponOrder==null){ | if(couponOrder==null){ | ||||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | ||||
| } | } | ||||
| if(!EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode().equals(couponOrder.getCouponOrderStatus())){ | |||||
| return new ResultData(ErrorCode.COUPON_GOODS_STATUS_NOT_SUPPORTED); | |||||
| } | |||||
| 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())){ | ||||
| @@ -229,6 +229,7 @@ public enum ErrorCode{ | |||||
| */ | */ | ||||
| COUPON_GOODS_DELIVERY_NULL(5000,"物流信息为空"), | COUPON_GOODS_DELIVERY_NULL(5000,"物流信息为空"), | ||||
| COUPON_GOODS_TYPE_NOT_SUPPORTED(5001,"该类型不支持发货"), | COUPON_GOODS_TYPE_NOT_SUPPORTED(5001,"该类型不支持发货"), | ||||
| COUPON_GOODS_STATUS_NOT_SUPPORTED(5002,"该状态不支持发货"), | |||||
| /** | /** | ||||
| * 卡 | * 卡 | ||||
| @@ -900,6 +900,10 @@ | |||||
| and co.coupon_type = #{couponType} | and co.coupon_type = #{couponType} | ||||
| </when> | </when> | ||||
| <otherwise> | <otherwise> | ||||
| <!-- and co.coupon_type != 5 --> | |||||
| and co.coupon_type != 11 | |||||
| <!-- and co.coupon_type != 12 --> | |||||
| <!-- and co.coupon_type != 51 --> | |||||
| and co.coupon_type < 100 | and co.coupon_type < 100 | ||||
| </otherwise> | </otherwise> | ||||
| </choose> | </choose> | ||||
| @@ -1010,6 +1014,10 @@ | |||||
| and co.coupon_type = #{couponType} | and co.coupon_type = #{couponType} | ||||
| </when> | </when> | ||||
| <otherwise> | <otherwise> | ||||
| <!-- and co.coupon_type != 5 --> | |||||
| and co.coupon_type != 11 | |||||
| <!-- and co.coupon_type != 12 --> | |||||
| <!-- and co.coupon_type != 51 --> | |||||
| and co.coupon_type < 100 | and co.coupon_type < 100 | ||||
| </otherwise> | </otherwise> | ||||
| </choose> | </choose> | ||||
| @@ -1261,7 +1269,7 @@ | |||||
| select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > | select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > | ||||
| </collection> | </collection> | ||||
| </resultMap> | </resultMap> | ||||
| <resultMap id="CVoResultMapOptimize" type="com.iformall.domain.vo.WxCouponOrderCVo"> | <resultMap id="CVoResultMapOptimize" type="com.iformall.domain.vo.WxCouponOrderCVo"> | ||||
| <id column="id" jdbcType="BIGINT" property="id" /> | <id column="id" jdbcType="BIGINT" property="id" /> | ||||
| <result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> | <result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> | ||||