Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

order-application-service/src/main/java/cn/freemud/constant/ResponseCodeConstant.java

@@ -9,7 +9,7 @@ public class ResponseCodeConstant {
 
     public final static String RESPONSE_SUCCESS_STR = "100";
 
-    public final static String COCO_RESPONSE_COUPON_ERR_STR = "46013";
+    public final static String COCO_RESPONSE_COUPON_ERR_STR = "49000";
 
     public final static String RESPONSE_SUCCESS_OK = "ok";
     public final static Integer RESPONSE_SUCCESS_1 = 1;

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -225,6 +225,12 @@ public enum ResponseResult {
     DELIVERY_INFO_NOT_DELIVERY("60001", "当前地址不可配送"),
     DELIVERY_INFO_ERROR("60002","配送地址不正确"),
     DELIVERY_CREATE_ERROR("60003","运单不足，配送失败"),
+
+
+    /**
+     * coco券验证失败
+     */
+    COCO_COUPON_VALIDATOR_FAIL("70000", "优惠券验证错误"),
     ;
 
 

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -143,7 +143,7 @@ public enum ResponseResult {
     COUPON_SHOP_NOTSUPPORT("46010", "优惠券在当前门店不可用"),
     COUPON_ORDER_WAY_ERROR("46011", "您选择得优惠券不适用该点餐方式"),
     COUPON_VERIFICATION_FAIL("46012", "优惠券核销失败"),
-    COCO_COUPON_VALIDATOR_FAIL("46013", "优惠券验证错误"),
+
     /**
      * 加价购商品
      */
@@ -174,7 +174,13 @@ public enum ResponseResult {
      */
     WEICHAT_SHOP_NOTSUPPORT("48001", "当前门店不可用"),
     WEICHAT_NOT_PRODUCTCARD("48002", "不是商品券不用加入购物车"),
-    WEICHAT_PRODUCT_NOEXIST("48003", "商品不存在");
+    WEICHAT_PRODUCT_NOEXIST("48003", "商品不存在"),
+
+    /**
+     * coco验证券错误
+     */
+    COCO_COUPON_VALIDATOR_FAIL("49000", "优惠券验证错误")
+    ;
 
 
     private String code;