换购券Alpha

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

@@ -10,14 +10,9 @@ import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
-import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.IPromotionService;
-import cn.freemud.service.UserService;
-import com.alibaba.fastjson.JSONArray;
-import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
-import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -156,7 +151,7 @@ public class CouponPromotionService implements IPromotionService {
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                 activityDiscountsDto.setActivityCode(apportionDetails.getActivityCode());
                 activityDiscountsDto.setActivityName(apportionDetails.getActivityName());
-                activityDiscountsDto.setActivityType(apportionDetails.getActivityType());
+                activityDiscountsDto.setActivityType(this.convent2ActivityType(apportionDetails.getActivityType()));
                 activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
                 return activityDiscountsDto;
             }
@@ -174,4 +169,12 @@ public class CouponPromotionService implements IPromotionService {
         activityClassifyCouponBean.setUsableCoupons(Lists.newArrayList());
         return activityClassifyCouponBean;
     }
+
+    private Integer convent2ActivityType(Integer type) {
+        Integer Hg = 33;
+        if (type != null && Hg.equals(type)) {
+            type = 32;
+        }
+        return type;
+    }
 }