From abcd83bd457a4300886a561557ce9606a0e943f2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 29 Sep 2021 18:59:16 +0800 Subject: [PATCH] update couponOrder --- .../controller/WxCouponOrderController.java | 13 ++++++++++++- .../main/java/com/iformall/common/ErrorCode.java | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index e11150bc0..12a8e6e6b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; @@ -25,6 +26,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.web.bind.annotation.*; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -408,8 +410,17 @@ public class WxCouponOrderController extends BaseController { if(StringUtils.isBlank(wxCouponOrder.getDeliveryInfo())){ return new ResultData(ErrorCode.COUPON_GOODS_DELIVERY_NULL); } + try{ + JSONObject jsonObject = JSONObject.parseObject(wxCouponOrder.getDeliveryInfo()); + jsonObject.put("date",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + updateCouponOrder.setDeliveryInfo(JSONObject.toJSONString(jsonObject)); + + }catch(Exception e){ + return new ResultData(ErrorCode.COUPON_GOODS_ADDRESS_ERROR); + } + updateCouponOrder.setShippingStatus(EnumOrderShopingStatus.WAIT_DISTRIBUTION.getCode()); - updateCouponOrder.setDeliveryInfo(wxCouponOrder.getDeliveryInfo()); + }else{ return new ResultData(ErrorCode.COUPON_GOODS_TYPE_NOT_SUPPORTED); } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 9150bcdfc..850a09594 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -230,6 +230,7 @@ public enum ErrorCode{ COUPON_GOODS_DELIVERY_NULL(5000,"物流信息为空"), COUPON_GOODS_TYPE_NOT_SUPPORTED(5001,"该类型不支持发货"), COUPON_GOODS_STATUS_NOT_SUPPORTED(5002,"该状态不支持发货"), + COUPON_GOODS_ADDRESS_ERROR(5003,"配送信息错误"), /** * 卡