From b1b26e9677a964f3e75ffcd0249c73c9d65e2404 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 28 Sep 2021 10:35:31 +0800 Subject: [PATCH] sendGoods --- .../controller/WxCouponOrderController.java | 40 +++++++++++++++++-- .../java/com/iformall/common/ErrorCode.java | 6 +++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 1da38baa1..5041bc3fe 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -9,9 +9,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponOrderBVo; import com.iformall.domain.vo.WxCouponOrderCVo; -import com.iformall.enums.EnumCouponType; -import com.iformall.enums.EnumCouponValidType; -import com.iformall.enums.EnumCreditLockedStatus; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.service.*; import io.swagger.annotations.Api; @@ -369,4 +367,40 @@ public class WxCouponOrderController extends BaseController { return new ResultData(); } + + @ApiOperation(value = "商品发货", notes = "{\"id\":\"string\", \"deliveryInfo\":\"string\"}") + @PostMapping("/sendGoods") + public ResultData sendGoods(@RequestBody WxCouponOrder wxCouponOrder) { + logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::postpone"); + if (wxCouponOrder == null || wxCouponOrder.getId() == null) { + logger.error("id不能为空: "); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + try { + WxCouponOrder couponOrder = wxCouponOrderService.getById(wxCouponOrder.getId(), getTenantInfo().getTenantId()); + if(couponOrder==null){ + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } + WxCouponOrder updateCouponOrder = new WxCouponOrder(); + updateCouponOrder.setId(couponOrder.getId()); + if(EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ + updateCouponOrder.setShippingStatus(EnumOrderShopingStatus.READY_SELF_MENTION.getCode()); + }else if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ + if(StringUtils.isBlank(wxCouponOrder.getDeliveryInfo())){ + return new ResultData(ErrorCode.COUPON_GOODS_DELIVERY_NULL); + } + updateCouponOrder.setShippingStatus(EnumOrderShopingStatus.WAIT_DISTRIBUTION.getCode()); + updateCouponOrder.setDeliveryInfo(wxCouponOrder.getDeliveryInfo()); + }else{ + return new ResultData(ErrorCode.COUPON_GOODS_TYPE_NOT_SUPPORTED); + } + updateCouponOrder.setUpdateDate(new Date()); + wxCouponOrderService.saveOrUpdate(updateCouponOrder); + + } catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + return new ResultData(); + } } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index b4bd65396..b14f8d0ad 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -224,6 +224,12 @@ public enum ErrorCode{ COUPON_MANJIAN_USE_PRICE_NO_ALLOW_(4011, "满减券金额不符合条件"), COUPON_ORDER_TYPE_NOT_SUPPORTED(4012, "券类型不支持"), + /** + * 商品 + */ + COUPON_GOODS_DELIVERY_NULL(5000,"物流信息为空"), + COUPON_GOODS_TYPE_NOT_SUPPORTED(5001,"该类型不支持发货"), + /** * 卡 */