management->日志改造, pom.xml 日志版本升级2.1.beat

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-management/src/main/java/cn/freemud/management/service/handle/CouponHandle.java

@@ -7,7 +7,6 @@ import cn.freemud.management.thirdparty.CouponOfflineMCCafeClient;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
-import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.collections4.CollectionUtils;
@@ -43,7 +42,6 @@ public class CouponHandle {
                     if (RESPONSE_SUCCESS.equals(redeem.getStatusCode())) {
                         break;
                     }
-                    logUtil.error("核销券码异常 mcCafeCouponRequest:{}, redeem:{}",null, mcCafeCouponRequest, redeem);
                     if (i == 0 && !RESPONSE_SUCCESS.equals(redeem.getStatusCode())) {
                         logUtil.error("核销券码异常 mcCafeCouponRequest:{}, redeem:{}",null, mcCafeCouponRequest, redeem);
                     }

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

 package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.base.util.JsonUtil;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.enums.RefundStatus;
 import cn.freemud.management.enums.ResponseResult;
-import cn.freemud.management.enums.SettlementTypeEnum;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;
 import cn.freemud.management.util.ResponseUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
-import com.freemud.application.sdk.api.couponcenter.offline.domain.TransactionVO;
-import com.freemud.application.sdk.api.couponcenter.offline.request.CouponRequest;
-import com.freemud.application.sdk.api.log.ApiLog;
-import com.freemud.application.sdk.api.log.LogThreadLocal;
-import com.freemud.application.sdk.api.ordercenter.enums.AbnormalStateEnum;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
-import com.freemud.application.sdk.api.ordercenter.request.SdkUpdateAbnormalState;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
-import com.freemud.sdk.api.assortment.order.enums.*;
-import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
-import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
+import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
+import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
+import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
+import com.freemud.sdk.api.assortment.order.enums.PayType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import com.google.common.collect.Lists;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
 
 import static cn.freemud.management.enums.OperateType.ORDER_AGREE_REFUND;
-import static cn.freemud.management.enums.OperateType.ORDER_CANCEL;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -65,7 +52,6 @@ import static cn.freemud.management.enums.OperateType.ORDER_CANCEL;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Service
 public class SaasOrderMangerServiceImpl implements OrderManagerService {
 
@@ -270,8 +256,6 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     private BaseResponse<OrderManagerResponse> executeRefund(OrderManagerRequest request,QueryOrdersResponse.DataBean.OrderBean orderBean, String operationType) {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.orderCancel(orderBean, request, OperateType.ORDER_AGREE_REFUND.getOpType());
-        log.info("executeRefund operationType :" + operationType);
-        log.info("executeRefund verifyResponse :" + JsonUtil.toJSONString(verifyResponse));
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return ResponseUtil.error(verifyResponse.getCode());
         }
@@ -280,7 +264,6 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         if (operationType.equalsIgnoreCase(OperateType.ORDER_REJECT.getOpType())) {
             baseResponse = this.orderReject(request, orderBean);
         }
-        log.info("executeRefund executeRefund baseResponse :" + JsonUtil.toJSONString(baseResponse));
         if(null == baseResponse || !ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){
             emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage());
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);

pom.xml

@@ -113,7 +113,7 @@
             <dependency>
                 <groupId>com.freemud.application.service.sdk</groupId>
                 <artifactId>sdk-common-base</artifactId>
-                <version>2.0.BETA</version>
+                <version>2.1.BETA</version>
             </dependency>
 
             <!--              mybatis            -->