Merge branch '20211223-code_v4接口查询优化-zhiwei.zha'

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/Finals.java

@@ -28,6 +28,7 @@ public class Finals {
     public static final String MEMBER_ID = "member_id";
     public static final String CHANNEL_ID_LIST = "channelIds";
     public static final String CHANNEL_CODE_LIST = "channelCodes";
+    public static final String IS_QUERY_STORE = "isQueryStore";
     public static final Integer PRODUCT_COUPON = 0;
     public static final Integer CASH_COUPON = 1;
     public static final Integer ELSE_COUPON = 2;

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/KgdCouponServiceImpl.java

@@ -23,7 +23,6 @@ import cn.freemud.redis.RedisCache;
 import cn.freemud.service.thirdparty.CouponOnlineClient;
 import cn.freemud.utils.RedisUtil;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
-import com.freemud.application.sdk.api.util.SignUtil;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import ma.glasnost.orika.MapperFacade;
@@ -61,7 +60,7 @@ public class KgdCouponServiceImpl implements CouponService {
 
     @Override
     public CouponDetailBO getCouponDetail(GetCouponDetailBO getCouponDetailBO) {
-        Map<String, String> map = new TreeMap<>();
+        Map<String, Object> map = new TreeMap<>();
         if (StringUtils.isBlank(getCouponDetailBO.getPartnerId()) || StringUtils.isBlank(getCouponDetailBO.getCouponCode())) {
             return null;
         }
@@ -73,13 +72,12 @@ public class KgdCouponServiceImpl implements CouponService {
         GetStoreBO getStoreBO = new GetStoreBO();
         getStoreBO.setPartnerId(getCouponDetailBO.getPartnerId());
         getStoreBO.setStoreCode(getCouponDetailBO.getStoreCode());
-
+        // 由于门店服务老是慢，这个参数可以控制不查门店服务， 返回的数据也不需要门店数据
+        map.put(Finals.IS_QUERY_STORE, false);
         List<String> orgIds = storeService.getOrgIds(getStoreBO);
         String channelIds = CollectionUtils.isNotEmpty(orgIds) ? Joiner.on(",").join(orgIds) : "";
         map.put(Finals.CHANNEL_ID_LIST, channelIds);
-        String appSecret = getAppSecret(getCouponDetailBO.getPartnerId());
-        String sign = SignUtil.createMD5Sign(map, appSecret);
-        map.put(Finals.SIGN, sign);
+        map.put(Finals.SIGN, "adapterV4Skip" + getCouponDetailBO.getPartnerId());
         GetCouponDetailResponseDto responseDto = couponOnlineClient.getCouponDetails(map);
         if (ResponseCodeConstant.RESPONSE_SUCCESS_1.equals(responseDto.getResult())) {
             return convert2CouponDetailBO(responseDto);

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

@@ -40,7 +40,6 @@ import com.freemud.application.sdk.api.productcenter.constant.ResponseConstant;
 import com.freemud.application.sdk.api.util.SignUtil;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -133,7 +132,7 @@ public class CouponServiceImpl implements CouponService {
     @Override
     public GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo) {
         //券详情查券服务
-        Map<String, String> map = new TreeMap<String, String>();
+        Map<String, Object> map = new TreeMap<>();
         if (StringUtils.isBlank(requestVo.getPartnerId()) || StringUtils.isBlank(requestVo.getCouponCode())) {
             return null;
         }
@@ -148,9 +147,9 @@ public class CouponServiceImpl implements CouponService {
             map.put(Finals.STOREID, requestVo.getStoreId());
             map.put(Finals.STORECHECK, "0");
         }
-        String appSecret = getAppSecret(requestVo.getPartnerId());
-        String sign = SignUtil.createMD5Sign(map, appSecret);
-        map.put(Finals.SIGN, sign);
+        // 由于门店服务老是慢，这个参数可以控制不查门店服务， 返回的数据也不需要门店数据
+        map.put(Finals.IS_QUERY_STORE, false);
+        map.put(Finals.SIGN, "adapterV4Skip" + requestVo.getPartnerId());
         GetCouponDetailResponseDto responseDto = couponOnlineClient.getCouponDetails(map);
         if (ResponseCodeConstant.RESPONSE_SUCCESS_1.equals(responseDto.getResult())) {
             return responseDto;