sunyu::update::fix bug about getCouponNameByCode

shopping-cart-application-service/pom.xml

@@ -297,18 +297,6 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.freemud</groupId>
-            <artifactId>order-management</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.freemud</groupId>
-            <artifactId>order-application-service</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
     <build>

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

@@ -17,11 +17,6 @@ import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
-import cn.freemud.management.entities.dto.request.order.MCCafeCouponRequest;
-import cn.freemud.management.entities.dto.request.order.MCCafeCouponVo;
-import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
-import cn.freemud.management.enums.CouponReqTypeEnum;
-import cn.freemud.management.enums.MCCafeChannelEnum;
 import cn.freemud.service.ActivityService;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.impl.AssortmentSdkService;
@@ -41,6 +36,7 @@ import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -114,9 +110,6 @@ public class ShoppingCartMCoffeeServiceImpl {
     @Autowired
     private StoreCenterService storeCenterService;
     @Autowired
-    private CouponClientService couponClientService;
-
-    @Autowired
     private ProductClient productClient;
     @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
@@ -190,7 +183,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         //根据券号获取券名称
         String couponName = "";
         if (StringUtils.isNotEmpty(couponCode)){
-            couponName = getCouponNameByCode(couponCode,userId,sessionId);
+            CustomerInfoVo userLoginInfoDto = getCustomerInfoVo(sessionId);
+            couponName = getCouponNameByCode(couponCode,userLoginInfoDto,BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
             addCartGoods.setCouponName(couponName);
         }
 
@@ -1715,40 +1709,15 @@ public class ShoppingCartMCoffeeServiceImpl {
         return requestVo;
     }
 
-    private String getCouponNameByCode(String couponCode,String userId,String sessionId){
+    private String getCouponNameByCode(String couponCode,CustomerInfoVo userInfo,String menuType){
         String couponName = "";
         //加购的时候根据券号查询券名称，存入cartGood
-        if (StringUtils.isNotEmpty(couponCode)){
-            List<MCCafeCouponVo> mcCafeCouponVos = new ArrayList<>();
-            MCCafeCouponVo mcCafeCouponVo = new MCCafeCouponVo(couponCode);
-            mcCafeCouponVos.add(mcCafeCouponVo);
-
-            CustomerInfoVo userLoginInfoDto = null;
-            if (StringUtils.isEmpty(userId)) {
-                userLoginInfoDto = getCustomerInfoVo(sessionId);
-            }
-            MCCafeCouponRequest mcCafeCouponRequest = MCCafeCouponRequest.builder()
-                    .ver(88)
-                    .reqtype(88)
-                    .partnerId(Integer.valueOf(userLoginInfoDto.getPartnerId()))
-                    .store_id(userLoginInfoDto.getStoreId())
-                    .station_id("1")
-                    .operator_id(userId)
-                    .channel(UserLoginChannelEnum.ALIPAY.getCode().equals(userLoginInfoDto.getChannel())? MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
-                    .couponlist(mcCafeCouponVos)
-                    .sign("skip")
-                    .build();
-            McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
-            if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
-                    && CollectionUtils.isNotEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
-                for (McdNetBatchQueryResponse.Coupon coupon : mcdNetBatchQueryResponse.getCouponlist()) {
-                    if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(coupon.getStatusCode())) {
-                        if(coupon.getCodeInfo() != null) {
-                            couponName = coupon.getCodeInfo().getAct_name();
-                        }
-                    }
-                }
-            }
+        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();
         }
         return couponName;
     }