Merge remote-tracking branch 'origin/feature/20201112_fixbug-getCouponNameByCode_yu.sun'

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

@@ -20,6 +20,7 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.ActivityService;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.impl.AssortmentSdkService;
+import cn.freemud.service.impl.CouponServiceImpl;
 import cn.freemud.service.impl.FullSubtractionActivityServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CalculationServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CouponDiscountCalculation;
@@ -106,6 +107,8 @@ public class ShoppingCartMCoffeeServiceImpl {
     @Autowired
     private StoreCenterService storeCenterService;
     @Autowired
+    private CouponServiceImpl couponService;
+    @Autowired
     private ProductClient productClient;
     @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
@@ -180,7 +183,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         String couponName = "";
         if (StringUtils.isNotEmpty(couponCode)){
             CustomerInfoVo userLoginInfoDto = getCustomerInfoVo(sessionId);
-            couponName = getCouponNameByCode(couponCode,userLoginInfoDto,BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+            couponName = getCouponNameByCode(couponCode,userLoginInfoDto,
+                    BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode(),storeId);
             addCartGoods.setCouponName(couponName);
         }
 
@@ -1723,15 +1727,23 @@ public class ShoppingCartMCoffeeServiceImpl {
         return requestVo;
     }
 
-    private String getCouponNameByCode(String couponCode,CustomerInfoVo userInfo,String menuType){
+    private String getCouponNameByCode(String couponCode,CustomerInfoVo userInfo,String menuType,String storeId){
         String couponName = "";
-        //加购的时候根据券号查询券名称，存入cartGood
-        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(userInfo.getPartnerId(),
-                userInfo.getStoreId(),couponCode , menuType);
-        CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
-        CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto);
-        if (null != checkSpqInfoRequestDto && StringUtils.isNotEmpty(checkSpqInfoResponseDto.getActivityName())){
-            couponName = checkSpqInfoResponseDto.getActivityName();
+
+        String partnerId = userInfo.getPartnerId();
+        GetMemberCouponRequestVo requestVo = new GetMemberCouponRequestVo();
+        requestVo.setPartnerId(partnerId);
+        requestVo.setCouponCode(couponCode);
+        requestVo.setStoreId(storeId);
+        GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
+
+        if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
+            return couponName;
+        }
+
+        if (null != couponDetailResponseDto && CollectionUtils.isNotEmpty(couponDetailResponseDto.getDetails())
+                && null != couponDetailResponseDto.getDetails().get(0)){
+            couponName = couponDetailResponseDto.getDetails().get(0).getActive().getActiveName();
         }
         return couponName;
     }