From 0ca9b8f9a455115c71e28ceedf6bc07a3c824fb7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 29 Sep 2021 13:42:13 +0800 Subject: [PATCH] update couponOrder --- .../iformall/controller/WxCouponOrderController.java | 5 ++++- .../src/main/java/com/iformall/common/ErrorCode.java | 1 + .../src/main/resources/mapper/WxCouponOrderMapper.xml | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 5275c1acb..e11150bc0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -384,7 +384,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(); } - @ApiOperation(value = "商品发货", notes = "{\"id\":\"string\", \"deliveryInfo\":\"string\"}") + @ApiOperation(value = "商品发货", notes = "{\"id\":\"string\", \"deliveryInfo\":\"jsonString\"}") @PostMapping("/sendGoods") public ResultData sendGoods(@RequestBody WxCouponOrder wxCouponOrder) { logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::postpone"); @@ -397,6 +397,9 @@ public class WxCouponOrderController extends BaseController { if(couponOrder==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(); updateCouponOrder.setId(couponOrder.getId()); if(EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index b14f8d0ad..9150bcdfc 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -229,6 +229,7 @@ public enum ErrorCode{ */ COUPON_GOODS_DELIVERY_NULL(5000,"物流信息为空"), COUPON_GOODS_TYPE_NOT_SUPPORTED(5001,"该类型不支持发货"), + COUPON_GOODS_STATUS_NOT_SUPPORTED(5002,"该状态不支持发货"), /** * 卡 diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index a0e07c4c7..13c0f65d6 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -900,6 +900,10 @@ and co.coupon_type = #{couponType} + + and co.coupon_type != 11 + + and co.coupon_type < 100 @@ -1010,6 +1014,10 @@ and co.coupon_type = #{couponType} + + and co.coupon_type != 11 + + and co.coupon_type < 100 @@ -1261,7 +1269,7 @@ select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > - +