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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

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

@@ -3683,10 +3683,7 @@ public class OrderServiceImpl implements Orderservice {
         if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
             return ResponseUtil.error(ResponseResult.COUPON_ORDER_COMMON_VERIFY_FAIL.getCode(), "已存在退款申请,请耐心等待处理");
         }
-        // fisherman 需要核实一下 是否申请退款,订单主状态还不会变
-
         // fisherman 查询配置是否能退款 未完成
-
         boolean isTrue = orderAdapter.checkRefundButtionBizTypeIs6(orderBean.getCompanyId(), orderBean.getBizType(),
                 orderBean.getStatus(),userLoginInfoDto.getWxAppId(), new Date(orderBean.getGmtCreate()), orderBean.getOrderType());
         if (isTrue) {

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

@@ -61,7 +61,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,7 +73,8 @@ 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);

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/DeliveryService.java

@@ -19,8 +19,6 @@ import cn.freemud.entities.dto.console.DeliveryInfoExpandFieldDTO;
 import cn.freemud.entities.dto.console.NightDeliveryuInfo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.utils.DateTimeUtil;
-import com.alibaba.fastjson.JSON;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import lombok.SneakyThrows;
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -81,7 +79,6 @@ public interface DeliveryService {
                 }
             }
         }
-        ShoppingSdkLogUtil.printLog("fisherman 组装额外时间",new SimpleDateFormat(DateUtil.FORMAT_time).parse(DateTimeUtil.getCurrentTimeStr()).toString(), JSON.toJSONString(expandFields));
         return list;
     }
 

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,6 +147,8 @@ public class CouponServiceImpl implements CouponService {
             map.put(Finals.STOREID, requestVo.getStoreId());
             map.put(Finals.STORECHECK, "0");
         }
+        // 由于门店服务老是慢，这个参数可以控制不查门店服务， 返回的数据也不需要门店数据
+        map.put(Finals.IS_QUERY_STORE, false);
         String appSecret = getAppSecret(requestVo.getPartnerId());
         String sign = SignUtil.createMD5Sign(map, appSecret);
         map.put(Finals.SIGN, sign);

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

@@ -1959,7 +1959,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          * 满额减配送费   优选活动 再配送券
          */
         if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
-            ShoppingSdkLogUtil.printLog("fisherman 夜间配送费设置",JSON.toJSONString(calculationDiscountResult), "");
             DecimalFormat df = new DecimalFormat("###.##");
             List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
             activityTypeEnums.add(ActivityTypeEnum.TYPE_14);