去除枚举值APP_COUPON

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/enums/BizTypeEnum.java

@@ -10,10 +10,6 @@ package com.freemud.sdk.api.assortment.shoppingcart.enums;
  */
 public enum BizTypeEnum {
 
-    //字段6代表卖券订单。
-    //蜜雪APP和平台通用。
-    //后续使用此字段需注意。名称APP_COUPON取得有些误导，由于有地方使用，暂时不更改
-    APP_COUPON(6, "卖券订单"),
     ORDINARY(1, "普通订单"),
     VIRTUAL(2, "虚拟订单"),
     MEMBERS(3, "会员订单"),

order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java

@@ -190,7 +190,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         checkOrder.checkOrderByStore(storeResponse.getBizVO());
         /**蜜雪新增需求-->APP可以购买虚拟商品券业务逻辑**/
         OrderBeanV1 orderBean = new OrderBeanV1();
-        if (createOrderReq.getBizType() != null && BizTypeEnum.APP_COUPON.getBizType().equals(createOrderReq.getBizType())) {
+        if (createOrderReq.getBizType() != null && BizTypeEnum.SALE_COUPON.getBizType().equals(createOrderReq.getBizType())) {
             //现阶段蜜雪卖券业务是能单个，所以默认取0.后续多个的话，也需要调整平台买券取数规则
             String skuId = createOrderReq.getOrderProducts().get(0).getSkuId();
             //20200107提取虚拟商品券效验方法---》校验虚拟商品，如果正常则返回创建订单对象

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1700,7 +1700,7 @@ public class OrderServiceImpl implements Orderservice {
         backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
         //取消支付时，清理key.此处不做校验是否限制次数的单子，卖券订单直接清理
         //【P0】【业务 / 米食】【B端 / 万象 / 活动下架】商户618活动：一元买虚拟商品特殊处理活动下架，删除特殊增加字段 7.13 wanghanghang
-//        if(Objects.equals(BizTypeEnum.APP_COUPON.getBizType(),orderBean.getBizType())){
+//        if(Objects.equals(BizTypeEnum.SALE_COUPON.getBizType(),orderBean.getBizType())){
 //            buyProductOnceManager.removeCheckBuyProductOnceKey(orderBean.getCompanyId(),orderBean.getUserId(),orderBean.getProductList().get(0).getProductId());
 //        }
         return ResponseUtil.success();
@@ -1751,7 +1751,7 @@ public class OrderServiceImpl implements Orderservice {
         backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
         //取消支付时，清理key.此处不做校验是否限制次数的单子，卖券订单直接清理
         //【P0】【业务 / 米食】【B端 / 万象 / 活动下架】商户618活动：一元买虚拟商品特殊处理活动下架，删除特殊增加字段 wanghanghang
-//        if(Objects.equals(BizTypeEnum.APP_COUPON.getBizType(),orderBean.getBizType())){
+//        if(Objects.equals(BizTypeEnum.SALE_COUPON.getBizType(),orderBean.getBizType())){
 //            buyProductOnceManager.removeCheckBuyProductOnceKey(orderBean.getCompanyId(),orderBean.getUserId(),orderBean.getProductList().get(0).getProductId());
 //        }
         return ResponseUtil.success();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/BizTypeEnum.java

@@ -10,10 +10,6 @@ package com.freemud.application.sdk.api.ordercenter.enums;
  */
 public enum BizTypeEnum {
 
-    //字段6代表卖券订单。
-    //蜜雪APP和平台通用。
-    //后续使用此字段需注意。名称APP_COUPON取得有些误导，由于有地方使用，暂时不更改
-    APP_COUPON(6, "卖券订单"),
     ORDINARY(1, "普通订单"),
     VIRTUAL(2, "虚拟订单"),
     MEMBERS(3, "会员订单"),

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java

 package cn.freemud.service.impl;
 
-import ch.qos.logback.classic.Level;
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.constant.ApplicationConstant;
 import cn.freemud.constant.ResponseCodeConstant;
+import cn.freemud.entities.dto.GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean;
 import cn.freemud.entities.dto.GetProductInfoDto;
 import cn.freemud.entities.dto.ProductInfosDto;
 import cn.freemud.entities.vo.CartGoods;
@@ -11,38 +10,29 @@ import cn.freemud.entities.vo.ShoppingCartGoodsBaseResponseVo;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.thirdparty.StoreItemClient;
-import cn.freemud.service.thirdparty.StoreItemClient;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
-//import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.RedisKeyConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartConstant;
-import com.freemud.sdk.api.assortment.shoppingcart.enums.BizTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import cn.freemud.entities.dto.GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *