Merge branches 'feature/20210330_log.info修改_wuping' and…

Merge branches 'feature/20210330_log.info修改_wuping' and 'feature/20210507_合并打印日志分支_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20210507_合并打印日志分支_wuping

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java
#	order-application-service/src/test/java/cn.freemud/client/StockClientTest.java
#	order-application-service/src/test/java/cn.freemud/client/StoreClientTest.java
#	shopping-cart-application-service/src/main/java/cn/freemud/hystrix/MemberClientFallbackFactory.java
#	shopping-cart-application-service/src/main/java/cn/freemud/hystrix/ShortMessageClientFallbackFactory.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuriedPointServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/RecommendServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/StoreServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
#	shopping-cart-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/client/PaymentClientTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/client/ShoppingCartClientTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/client/StoreClientTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/client/WeChatClientTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartNewServiceTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/UserServiceTest.java

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -36,7 +36,6 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
  */
 @Component
-@Slf4j
 public class ShoppingCartAdapter {
     private static final String ATTRIBUTEID = "attributeId";
     private static final String ATTRIBUTENAME = "attributeName";
@@ -265,7 +264,7 @@ public class ShoppingCartAdapter {
      * @param productBeans 购物车中所有的productId对应的商品详情
      */
     public void updateCartGoodsInfoNew(CartGoods cartGoods, List<ProductBeanDTO> productBeans) {
-        log.info("【updateCartGoodsInfoNew】： cartGoods: {}, productBeans: {} ,trackingNo:{}", JSONObject.toJSONString(cartGoods), JSONObject.toJSONString(productBeans), LogThreadLocal.getTrackingNo());
+//        log.info("【updateCartGoodsInfoNew】： cartGoods: {}, productBeans: {} ,trackingNo:{}", JSONObject.toJSONString(cartGoods), JSONObject.toJSONString(productBeans), LogThreadLocal.getTrackingNo());
         try {
             Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
             if (!firstProduct.isPresent()) {

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -24,6 +24,7 @@ import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.WechatReportOrderDto;
 import cn.freemud.entities.vo.OrderCallBackRequestVo;
 import cn.freemud.redis.RedisCache;
+import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
@@ -56,7 +57,6 @@ import org.springframework.util.CollectionUtils;
 import java.util.*;
 
 @Component
-@Slf4j
 public class OrderCallBackMQService {
     private static ApplicationContext context;
     private static Logger logger = LoggerFactory.getLogger(OrderCallBackMQService.class);
@@ -107,7 +107,7 @@ public class OrderCallBackMQService {
             return;
         }
         String orderCode=body.getOrderCode();
-        ApiLog.info("backOrdersStatusChange", orderCode);
+//        ApiLog.info("backOrdersStatusChange", orderCode);
         OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
         requestDto.setOid(orderCode);
         //2：未支付
@@ -281,7 +281,7 @@ public class OrderCallBackMQService {
      */
     private void sendInvoiceReportMQ(OrderCallBackRequestVo body) {
 
-        log.info("callback send invoice report MQ:{},{}",body.getOrderCode(), JSON.toJSONString(body));
+        ApiLog.debug("callback send invoice report MQ:{},{}",body.getOrderCode(), JSON.toJSONString(body));
         if (!ObjectUtils.equals("1", body.getMsgType()) || body.getOperateType() == null || body.getOperateType() == 2) {
             return ;
         }
@@ -298,9 +298,9 @@ public class OrderCallBackMQService {
 
             MQMessage<OrderInfoReqs> message = new MQMessage<>(header, orderInfoReqs);
             mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
-            log.info("callback send invoice mq orderCode={},mqRequest={}",body.getOrderCode(), JSON.toJSONString(orderInfoReqs));
+            ApiLog.debug("callback send invoice mq orderCode={},mqRequest={}",body.getOrderCode(), JSON.toJSONString(orderInfoReqs));
         } catch (Exception e) {
-            log.error("callback set invoice mq orderCode={},exception={}",orderInfoReqs.getOrderCode(),e.toString());
+            LogUtil.error("callback set invoice mq orderCode={},exception={}",orderInfoReqs.getOrderCode(),"",e);
         }
     }
 
@@ -310,7 +310,7 @@ public class OrderCallBackMQService {
      */
     public void revertParkingOrders(OrderCallBackRequestVo body){
         String orderCode=body.getOrderCode();
-        ApiLog.info("parkingOrderBackOrdersStatusChange", orderCode);
+        ApiLog.debug("parkingOrderBackOrdersStatusChange", orderCode);
         OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
         requestDto.setOid(orderCode);
         //2：未支付

call-back-service/src/main/java/cn/freemud/config/WebMvcConfig.java

@@ -26,7 +26,7 @@ import java.util.List;
  * WebMvcConfigurer
  */
 @Configuration
-@Slf4j
+//@Slf4j
 public class WebMvcConfig implements WebMvcConfigurer {
     @Bean
     public ObjectMapper objectMapper(){

call-back-service/src/test/java/cn.freemud/client/ActivityClientTest.java

@@ -18,7 +18,6 @@
 //
 //import static org.junit.Assert.assertEquals;
 //
-//@Slf4j
 //@RunWith(SpringRunner.class)
 //@SpringBootTest
 //@EnableDiscoveryClient

call-back-service/src/test/java/cn.freemud/manager/IappWxappConfigManagerTest.java

@@ -20,7 +20,6 @@
 //import org.springframework.boot.test.context.SpringBootTest;
 //import org.springframework.test.context.junit4.SpringRunner;
 //
-//@Slf4j
 //@RunWith(SpringRunner.class)
 //@SpringBootTest
 //public class IappWxappConfigManagerTest {

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

@@ -55,6 +55,7 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
 import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
@@ -105,7 +106,6 @@ import java.util.stream.Collectors;
 import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
 
 @Component
-@Slf4j
 public class OrderAdapter {
     private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
 
@@ -652,7 +652,7 @@ public class OrderAdapter {
         String deliveryType = userDeliveryInfoDto != null && userDeliveryInfoDto.getStoreDeliveryInfoDto() != null
                 ? userDeliveryInfoDto.getStoreDeliveryInfoDto().getDeliveryType() : "";
         createOrderVo.setUserDeliveryInfoDto(userDeliveryInfoDto);
-        log.info("getCreateOrderDto sessionId:{},createOrderVo:{}",createOrderVo.getSessionId(),JSON.toJSONString(createOrderVo));
+//        log.debug("getCreateOrderDto sessionId:{},createOrderVo:{}",createOrderVo.getSessionId(),JSON.toJSONString(createOrderVo));
         Integer orderType;
         String receiveAddress = createOrderVo.getStoreAddress();
         if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
@@ -4199,7 +4199,7 @@ public class OrderAdapter {
                 payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
             }
         }catch (Exception e){
-            log.error("getPayTurnoffRefund error:{}", e.getMessage());
+            ApiLog.debug("getPayTurnoffRefund error:{}", e.getMessage());
         }
         return payTurnoffRefund;
     }

order-application-service/src/main/java/cn/freemud/amp/service/ProduceMQService.java

@@ -8,6 +8,8 @@ import cn.freemud.amqp.MQService;
 import cn.freemud.constant.RocketMQConst;
 import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.log.ErrorLog;
 import com.google.common.base.Throwables;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.BooleanUtils;
@@ -25,7 +27,6 @@ import javax.annotation.Resource;
 /**
  * mq发送方
  */
-@Slf4j
 @Service
 public class ProduceMQService {
     @Autowired
@@ -47,7 +48,8 @@ public class ProduceMQService {
         try {
             mqService.convertAndSend(PushOrderConfig.EXCHANGE_NAME, PushOrderConfig.OPEN_PLATFORM_ORDER_DELIVERY_ROUTING_KEY, mqMessage);
         } catch (Exception e) {
-            log.error("sendOfDeliveryInfo.error, message:{}, cause:{}", JSON.toJSONString(deliveryRequest), Throwables.getStackTraceAsString(e));
+            ErrorLog.printErrorLog("sendOfDeliveryInfo.error","delivery/callbackUrl",deliveryRequest,e);
+//            log.error("sendOfDeliveryInfo.error, message:{}, cause:{}", JSON.toJSONString(deliveryRequest), Throwables.getStackTraceAsString(e));
         }
     }
 
@@ -72,9 +74,10 @@ public class ProduceMQService {
 
         try {
             SendResult sendResult = deliveryRocketMqTemplate.syncSendOrderly(destination, message, deliveryRequest.getOrderId());
-            log.info("sendDelivery of status:{}, message:{},", sendResult.toString(), JSON.toJSONString(message));
+//            log.debug("sendDelivery of status:{}, message:{},", sendResult.toString(), JSON.toJSONString(message));
         } catch (Exception e) {
-            log.error("sendDelivery.error, message:{}, cause:{}", JSON.toJSONString(message), Throwables.getStackTraceAsString(e));
+            ErrorLog.printErrorLog("sendDelivery.error","delivery/callbackUrl",message,e);
+//            log.error("sendDelivery.error, message:{}, cause:{}", JSON.toJSONString(message), Throwables.getStackTraceAsString(e));
         }
     }
 }

order-application-service/src/main/java/cn/freemud/aop/WebAspect.java

@@ -45,7 +45,6 @@ import java.util.Objects;
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Aspect
 @Component
 public class WebAspect {

order-application-service/src/main/java/cn/freemud/config/WebMvcConfig.java

@@ -28,7 +28,7 @@ import java.util.List;
  * WebMvcConfigurer
  */
 @Configuration
-@Slf4j
+//@Slf4j
 public class WebMvcConfig implements WebMvcConfigurer {
     @Bean
     public ObjectMapper objectMapper(){

order-application-service/src/main/java/cn/freemud/controller/CallerController.java

@@ -17,13 +17,12 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 叫号器
  */
-@Slf4j
 @RequestMapping("order/caller")
 @RestController
 @Validated
 public class CallerController {
 
-private CallerService callerService;
+    private CallerService callerService;
 
     public CallerController(CallerService callerService) {
         this.callerService = callerService;
@@ -31,12 +30,13 @@ private CallerService callerService;
 
     /**
      * 取餐通知
+     *
      * @return
      */
     @PostMapping("/takeMealNotices")
     @ApiAnnotation(logMessage = "takeMealNotices")
-    public BaseResponse takeMealNotices(@Validated @LogParams @RequestBody TakeMealNoticesVO vo){
-        return  callerService.takeMealNotices(vo);
+    public BaseResponse takeMealNotices(@Validated @LogParams @RequestBody TakeMealNoticesVO vo) {
+        return callerService.takeMealNotices(vo);
     }
 
 }

order-application-service/src/main/java/cn/freemud/controller/CollageOrderController.java

@@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @RequestMapping("/order")
 @RestController
 @Validated

order-application-service/src/main/java/cn/freemud/controller/CreateOrderController.java

@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @RequestMapping("/order")
 @RestController
 @Validated

order-application-service/src/main/java/cn/freemud/controller/EvaluationController.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
  */
-@Slf4j
 @RequestMapping("/order")
 @RestController
 @Validated

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -33,7 +33,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-@Slf4j
 @RequestMapping("/order")
 @RestController
 @Validated

order-application-service/src/main/java/cn/freemud/controller/ParkingOrderController.java

@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @RequestMapping("/order")
 @RestController
 @Validated

order-application-service/src/main/java/cn/freemud/controller/delivery/DeliveryController.java

@@ -29,7 +29,6 @@ import javax.validation.Valid;
  * @Copyright: ${DATE.YARE} www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @RequestMapping("/order")
 @RestController
 @Validated

order-application-service/src/main/java/cn/freemud/hystrix/MemberClientFallbackFactory.java

@@ -15,7 +15,6 @@ package cn.freemud.hystrix;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-@Slf4j
 @Component
 public class MemberClientFallbackFactory {
 

order-application-service/src/main/java/cn/freemud/interceptor/BizExceptionHandler.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @RestControllerAdvice
-@Slf4j
 public class BizExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)

order-application-service/src/main/java/cn/freemud/service/CallerService.java

@@ -22,6 +22,7 @@ import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.enums.NewOrderType;
@@ -42,7 +43,6 @@ import java.util.concurrent.TimeUnit;
 
 @AllArgsConstructor
 @Service
-@Slf4j
 public class CallerService {
 
     private final RedisTemplate redisTemplate;
@@ -86,12 +86,12 @@ public class CallerService {
             OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
             });
             if (Objects.isNull(extInfoDto.getOpenid())) {
-                log.error("订单号:{},没有openId", orderId);
+                ApiLog.info("订单号:{},没有openId", orderId);
                 return;
             }
             StoreResponse storeResponse = checkOrder.getStoreInfo(orderBean.getCompanyId(), orderBean.getShopId(), LogTreadLocal.getTrackingNo());
             if (storeResponse.getBizVO() == null) {
-                log.error("订单号:{},商户号:{},没有门店信息", orderId, orderBean.getShopId());
+                ApiLog.info("订单号:{},商户号:{},没有门店信息", orderId, orderBean.getShopId());
                 return;
             }
             List<Integer> takeawayOrderType = Lists.newArrayList(
@@ -133,8 +133,7 @@ public class CallerService {
             //发送模板消息
             SubscribeMessageResponse subscribeMessageResponse = ecologyAdminApplicationClient.subscribeMessage(subscribeMessageRequest);
             if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(subscribeMessageResponse.getCode())) {
-                log.error("ecologyAdminApplicationClient.subscribeMessage调用失败 ,request:{},body:{}", JSON.toJSONString(subscribeMessageResponse),
-                        JSON.toJSONString(subscribeMessageRequest));
+                ApiLog.info("ecologyAdminApplicationClient.subscribeMessage调用失败 ,request:{},body:{}", subscribeMessageResponse, subscribeMessageRequest);
             }
         });
 

order-application-service/src/main/java/cn/freemud/service/UserService.java

-//package cn.freemud.service;
-//
-//import cn.freemud.entities.dto.UserLoginInfoDto;
-//
-//import java.util.Map;
-//
-///**
-// * 用户服务
-// *
-// * @author liming.guo
-// * @date 2018/05/08
-// */
-//public interface UserService {
-//
-//    Map<String, Object> getUserInfoMapBySessionId(String sessionId);
-//
-//    /**
-//     * 获取缓存用户信息
-//     *
-//     * @param sessionId
-//     * @return
-//     */
-//    UserLoginInfoDto getUserLoginInfoBySessionId(String sessionId);
-//
-//}

order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheckAdapter.java

@@ -4,6 +4,7 @@ package cn.freemud.service.adapter;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +15,6 @@ import java.util.Objects;
 /**
  * 订单校验
  */
-@Slf4j
 public class OrderCheckAdapter {
 
     static ArrayList<OrderCheck> orderCheckList = Lists.newArrayList(new ToStoreCheck(), new TakeOutOrderCheck());
@@ -34,10 +34,10 @@ public class OrderCheckAdapter {
         StoreResponse.Configuration configuration = storeResponse.getBizVO().getStoreConfig();
         if(Objects.isNull(configuration)){
             //针对老数据没有配置 预约单默认支持，直接返回不校验
-            log.warn("商户:{},没有配置预约单",vo.getShopId());
+            ApiLog.info("商户:{},没有配置预约单",vo.getShopId());
             return;
         }
-        log.info("门店：{}，外卖预约单状态：{}，自提预约单状态:{}", vo.getShopId(), configuration.getDeliveryAppoint(), configuration.getSelfMentionSwitch());
+        ApiLog.debug("门店：{}，外卖预约单状态：{}，自提预约单状态:{}", vo.getShopId(), configuration.getDeliveryAppoint(), configuration.getSelfMentionSwitch());
         for (OrderCheck orderCheck : orderCheckList) {
             if (orderCheck.support(vo.getOrderType())) {
                 orderCheck.check(vo, storeResponse);

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

@@ -48,7 +48,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service("cocoCouponRelationService")
-@Slf4j
 public class CocoCouponRelationServiceImpl implements CouponRelationService {
 
     @Autowired
@@ -266,12 +265,12 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
 
                     ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
                     if (Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
-                        log.info("coco 核销券码返回成功，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
+                        ApiLog.info("coco 核销券码返回成功，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto),"");
                         break;
                     }
                     if (!Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
                         emailAlertService.sendEmailAlert("cooc核销券码失败", String.format("request:%s \r\nresponse:%s", JSONObject.toJSONString(couponCodeVerificationDto), JSONObject.toJSONString(couponCodeResponseDto)));
-                        log.info("coco 核销券码返回失败，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
+//                        log.debug("coco 核销券码返回失败，couponCodeVerificationDto：{},couponCodeResponseDto:{}，", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
                         return ResponseUtil.error(ResponseResult.COUPON_VERIFICATION_FAIL);
                     }
                 }

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

@@ -16,6 +16,7 @@ import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIa
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIappWxappConfigManager;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -45,15 +46,17 @@ import java.util.Map;
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Service
 public class BuriedPointServiceImpl implements BuriedPointService {
+
     @Value("${saas.wx.service.provider.appid}")
     private String appId;
     @Value("${saas.wx.service.provider.mchid}")
     private String mchId;
     @Value("${saas.wx.service.provider.signkey}")
     private String signKey;
+
+
     @Autowired
     private SyncTxProductClient syncTxProductClient;
     @Autowired
@@ -148,12 +151,12 @@ public class BuriedPointServiceImpl implements BuriedPointService {
                 optRequestDto.setActionList(actionListStr);
                 String strOptRequestDto = new Gson().toJson(optRequestDto);
                 dto.setOpt2(strOptRequestDto);
-                log.info("syncTxProductClient.BuriedPoint_BuriedPointPaymentbofore**" + dto);
+//                log.debug("syncTxProductClient.BuriedPoint_BuriedPointPaymentbofore**" + dto);
                 String str = syncTxProductClient.BuriedPoint(dto);
                 LogUtil.info("syncTxProductClient.BuriedPoint_BuriedPointPayment after", dto, str);
             }
         } catch (Exception e) {
-            log.info("支付之后埋点报错，让交易继续下去" + e);
+            ApiLog.error("支付之后埋点报错，让交易继续下去","",e);
         }
         return null;
     }
@@ -188,10 +191,10 @@ public class BuriedPointServiceImpl implements BuriedPointService {
             }
 
             paySuccessBuridPointDto.setSkus(skus);
-            log.info("paySuccessBuridPoint {}" + paySuccessBuridPointDto);
+            ApiLog.debug("paySuccessBuridPoint {}" + paySuccessBuridPointDto);
             Integer str = buriedPointClient.returnSubmit(paySuccessBuridPointDto);
         } catch (Exception e) {
-            log.info("paySuccessBuridPoint error {}" + e);
+            ApiLog.error("paySuccessBuridPoint error" ,"", e);
         }
         return null;
     }

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

@@ -625,8 +625,6 @@ public class CheckOrder {
         if (this.isCollageOrder(createOrderVo)) {
             apportionResponse = shoppingCartClient.getCollageShoppingCartGoodsApportion(requestDto);
         } else {
-
-//            log.info(JSONObject.toJSON(requestDto));
             apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto);
         }
 

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

@@ -27,6 +27,7 @@ import cn.freemud.service.thirdparty.ShoppingCartClient;
 import cn.freemud.service.thirdparty.WeChatClient;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.ordercenter.enums.ResponseResultEnum;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
@@ -53,7 +54,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-@Slf4j
 public class CollageOrderServiceImpl implements CollageOrderService {
     @Autowired
     private OrderServiceImpl orderService;
@@ -220,10 +220,10 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         getAuthorizerRequestDto.setAuthorizerAppid(userInfo.getWxAppId());
 
         // 通过partnerId以及appid获取access_token
-        log.info("collage access_token request partnerId:{} appId:{}", requestVo.getPartnerId(), userInfo.getWxAppId());
+        ApiLog.debug("collage access_token request partnerId:{} appId:{}", requestVo.getPartnerId(), userInfo.getWxAppId());
         GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
         String accessToken = getTokenResponseDto.getResult().getAccessToken();
-        log.info("collage access_token response access_token:{}", accessToken);
+        ApiLog.debug("collage access_token response access_token:{}", accessToken);
 
         // 构造群收款订单创建请求对象
         GroupBuyRequest groupBuyRequest = new GroupBuyRequest();
@@ -291,9 +291,9 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         desc.setText_desc(order.getShopName() + DateUtil.getCurrentDate(DateUtil.FORMAT_yyyyMMdd));
         groupBuyRequest.setDesc(desc);
 
-        log.info("collage groupBuy request param:{}", groupBuyRequest);
+        ApiLog.debug("collage groupBuy request param:{}", groupBuyRequest);
         GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
-        log.info("collage groupBuy response return:{}", groupBuyResponse);
+        ApiLog.debug("collage groupBuy response return:{}", groupBuyResponse);
 
         if (null != groupBuyResponse && groupBuyResponse.getErrcode() == 0) {
             GroupBuyResp groupBuyResp = new GroupBuyResp();

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

@@ -32,6 +32,7 @@ import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.PropertyConvertUtil;
 import cn.freemud.utils.RedisUtil;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 //import com.freemud.card.sdk.comm.Finals;
 //import com.freemud.card.sdk.comm.SignUtil;
 //import com.freemud.card.sdk.service.CouponAvailableService;
@@ -54,7 +55,6 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 @Service
-@Slf4j
 public class CouponServiceImpl implements CouponService {
     @Autowired
     private CouponOnlineClient couponOnlineClient;
@@ -193,7 +193,7 @@ public class CouponServiceImpl implements CouponService {
         try {
             getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto);
         } catch (Exception ex) {
-            log.error("会员服务优惠券接口调用失败", ex);
+            ApiLog.error("会员服务优惠券接口调用失败", "",ex);
         }
         if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) {
             return getMemberCouponListResponseDto.getData();

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

@@ -83,7 +83,6 @@ import java.util.stream.Collectors;
  * @Copyright: ${DATE.YARE} www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Service
 public class EncircleOrderServiceImpl implements EncircleOrderService {
 

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

@@ -128,7 +128,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
-@Slf4j
 public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
@@ -292,7 +291,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             dto.setTrackingNo(LogThreadLocal.getTrackingNo());
             paymentQueueService.paymentCallback(dto);
         } catch (Exception e) {
-            log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
+            ApiLog.error("paymentQueueService.paymentCallback" , dto ,e);
         }
 
     }
@@ -344,7 +343,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (StringUtils.isEmpty(oid)) {
             return;
         }
-        ApiLog.info("backOrdersStatusChange", oid, String.valueOf(orderStatus));
+        ApiLog.debug("backOrdersStatusChange", oid, String.valueOf(orderStatus));
         OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
         requestDto.setOid(oid);
         requestDto.setOrderStatus(orderStatus);
@@ -705,7 +704,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             request.setExtendParams(extendParams);
             com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
             if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
-                log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
+                ApiLog.info("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
                 return null;
             }
             putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid());
@@ -1069,7 +1068,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
     private QueryOrdersResponseDto.DataBean.OrderBean getOrderBean(ConfirmOrderDto confirmOrderDto) {
         Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId());
-        log.info("从缓存重新获取数据：", confirmOrderDto.getOrderId(), orderBeans);
+        ApiLog.debug("从缓存重新获取数据：", confirmOrderDto.getOrderId(), orderBeans);
         return orderBeans.get(OrderBeanType.SAASORDER.getCode());
     }
 

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

@@ -17,6 +17,7 @@ import cn.freemud.utils.ResponseUtil;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.util.LockUtils;
 import com.google.gson.Gson;
@@ -43,7 +44,6 @@ import java.util.Map;
  * @Copyright: ${DATE.YARE} www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Service
 public class OrderAdapterServiceImpl implements OrderAdapterService {
 
@@ -223,12 +223,12 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             // 蜜雪+混合支付专用：通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值
             String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(message.getTrans_id()));
             if (StringUtils.isNotBlank(orderId)) {
-                log.info("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), confirmOrderDto.getOrderId(), orderId);
+                ApiLog.debug("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), confirmOrderDto.getOrderId(), orderId);
                 confirmOrderDto.setOrderId(orderId);
             }
             Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId());
             if (MapUtils.isEmpty(orderBeans)) {
-                log.error("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogTreadLocal.getTrackingNo(), gson.toJson(message));
+                ApiLog.debug("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogTreadLocal.getTrackingNo(), gson.toJson(message));
                 return gson.toJson(message);
             }
             QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());//todo
@@ -298,12 +298,12 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             // 通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值
             String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(confirmOrderDto.getOrderId()));
             if (StringUtils.isNotBlank(orderId)) {
-                log.info("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), confirmOrderDto.getOrderId(), orderId);
+                ApiLog.debug("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), confirmOrderDto.getOrderId(), orderId);
                 confirmOrderDto.setOrderId(orderId);
             }
             Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId());
             if (MapUtils.isEmpty(orderBeans)) {
-                log.error("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogTreadLocal.getTrackingNo(), gson.toJson(message));
+                ApiLog.error("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogTreadLocal.getTrackingNo(), gson.toJson(message));
                 return gson.toJson(message);
             }
             QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());

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

@@ -50,7 +50,6 @@ import java.util.List;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class ParkingOrderServiceImpl implements ParkingOrderService {
 
     @Autowired

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

@@ -90,7 +90,6 @@ import java.util.concurrent.TimeUnit;
  */
 
 @Service
-@Slf4j
 public class SellCouponOrderServiceImpl {
 
     @Autowired

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

@@ -20,7 +20,6 @@
 // * @date 2018/05/11
 // */
 //@Service
-//@Slf4j
 //public class UserServiceImpl implements UserService {
 //    private static Gson gson = new Gson();
 //    @Autowired

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

-package cn.freemud.service.impl;
-
-import cn.freemud.service.OrderDistributeMQService;
-import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
-import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @version V1.0
- * @Title: ${FILE_NAME}
- * @Package com.freemud.mail.core
- * @Description: $微信订单上送MQ分发器服务接口
- * @author: aiqi.gong
- * @date: 2019/3/21 18:37
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-@Service
-@Slf4j
-public class WechatOrderPushDistributeMQServiceImpl implements OrderDistributeMQService {
-
-    @Autowired
-    private OrderDistributionService orderDistributionService;
-
-    @Override
-    public void messageDistribute(DisRequest disRequest) {
-        try {
-            orderDistributionService.pushOrder(disRequest);
-        }catch (Exception e){
-            log.error("OrderDistributeMQServiceImpl MQ消息发送失败",e.getMessage());
-        }
-    }
-
-
-}
+//package cn.freemud.service.impl;
+//
+//import cn.freemud.service.OrderDistributeMQService;
+//import com.freemud.application.sdk.api.log.ApiLog;
+//import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
+//import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * All rights Reserved, Designed By www.freemud.cn
+// *
+// * @version V1.0
+// * @Title: ${FILE_NAME}
+// * @Package com.freemud.mail.core
+// * @Description: $微信订单上送MQ分发器服务接口
+// * @author: aiqi.gong
+// * @date: 2019/3/21 18:37
+// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+// */
+//@Service
+//public class WechatOrderPushDistributeMQServiceImpl implements OrderDistributeMQService {
+//
+//    @Autowired
+//    private OrderDistributionService orderDistributionService;
+//
+//    @Override
+//    public void messageDistribute(DisRequest disRequest) {
+//        try {
+//            orderDistributionService.pushOrder(disRequest);
+//        }catch (Exception e){
+//            ApiLog.error("OrderDistributeMQServiceImpl MQ消息发送失败","",e);
+//        }
+//    }
+//
+//
+//}

order-application-service/src/main/java/cn/freemud/service/process/ActivityProcessor.java

-package cn.freemud.service.process;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * 描述类的作用
- * Created by:zhangbiao
- */
-@Slf4j
-@Component
-public abstract class ActivityProcessor extends AnnotationFactory {
-
-    public abstract String demo1();
-
-    public String publicDemo() {
-        return null;
-    }
-}
+//package cn.freemud.service.process;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 描述类的作用
+// * Created by:zhangbiao
+// */
+//@Component
+//public abstract class ActivityProcessor extends AnnotationFactory {
+//
+//    public abstract String demo1();
+//
+//    public String publicDemo() {
+//        return null;
+//    }
+//}

order-application-service/src/main/java/cn/freemud/service/process/AnnotationFactory.java

-package cn.freemud.service.process;
-
-import cn.freemud.annotations.ActivityImpl;
-import cn.freemud.enums.ActivityImplEnum;
-import com.google.common.base.Throwables;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.lang.annotation.Annotation;
-import java.util.*;
-
-/**
- * 描述类的作用
- * Created by:zhangbiao
- */
-@Slf4j
-@Component
-public class AnnotationFactory implements ApplicationContextAware {
-
-    private ApplicationContext applicationContext;
-
-    private static Map<Class<? extends Annotation>, Map<String, Object>> implMap = new HashMap<>();
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
-    }
-
-    /**
-     * 获取Bean
-     *
-     * @param c
-     * @return
-     */
-    public Object getBean(Class c) {
-        return this.applicationContext.getBean(c);
-    }
-
-    /**
-     * 获取注解类
-     *
-     * @param annotaion
-     * @return
-     */
-    private List<Object> getImplBeans(Class<? extends Annotation> annotaion) {
-        List<Object> classes = new ArrayList<>();
-
-        try {
-            Map<String, Object> beans = implMap.get(annotaion);
-            if (Objects.equals(beans, null) || beans.isEmpty()) {
-                beans = applicationContext.getBeansWithAnnotation(annotaion);
-                implMap.put(annotaion, beans);
-            }
-
-            Object object;
-            for (String key : beans.keySet()) {
-                object = beans.get(key);
-                classes.add(object);
-            }
-        } catch (Exception e) {
-            log.error("get implBeans exception:{};", Throwables.getStackTraceAsString(e));
-        }
-
-        log.info("get implBeans request:{};response:{};", annotaion, classes);
-        return classes;
-    }
-
-    /**
-     * 获取活动枚举
-     *
-     * @param T
-     * @param activityImplEnum
-     * @param <T>d
-     * @return
-     */
-    public <T> T getActivityImpl(Class<T> T, ActivityImplEnum activityImplEnum) {
-        try {
-            List<Object> classes = getImplBeans(ActivityImpl.class);
-            for (Object object : classes) {
-
-                ActivityImpl impl = object.getClass().getAnnotation(ActivityImpl.class);
-                ActivityImplEnum[] activityImplEnums = impl.value();
-                for (ActivityImplEnum at : activityImplEnums) {
-                    if (at.equals(activityImplEnum)) {
-                        return (T) object;
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            log.error("获取使用注解使用类异常：{},{}", e.getMessage(), e);
-        }
-        return null;
-    }
-}
+//package cn.freemud.service.process;
+//
+//import cn.freemud.annotations.ActivityImpl;
+//import cn.freemud.enums.ActivityImplEnum;
+//import com.google.common.base.Throwables;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.BeansException;
+//import org.springframework.context.ApplicationContext;
+//import org.springframework.context.ApplicationContextAware;
+//import org.springframework.stereotype.Component;
+//
+//import java.lang.annotation.Annotation;
+//import java.util.*;
+//
+///**
+// * 描述类的作用
+// * Created by:zhangbiao
+// */
+//@Slf4j
+//@Component
+//public class AnnotationFactory implements ApplicationContextAware {
+//
+//    private ApplicationContext applicationContext;
+//
+//    private static Map<Class<? extends Annotation>, Map<String, Object>> implMap = new HashMap<>();
+//
+//    @Override
+//    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+//        this.applicationContext = applicationContext;
+//    }
+//
+//    /**
+//     * 获取Bean
+//     *
+//     * @param c
+//     * @return
+//     */
+//    public Object getBean(Class c) {
+//        return this.applicationContext.getBean(c);
+//    }
+//
+//    /**
+//     * 获取注解类
+//     *
+//     * @param annotaion
+//     * @return
+//     */
+//    private List<Object> getImplBeans(Class<? extends Annotation> annotaion) {
+//        List<Object> classes = new ArrayList<>();
+//
+//        try {
+//            Map<String, Object> beans = implMap.get(annotaion);
+//            if (Objects.equals(beans, null) || beans.isEmpty()) {
+//                beans = applicationContext.getBeansWithAnnotation(annotaion);
+//                implMap.put(annotaion, beans);
+//            }
+//
+//            Object object;
+//            for (String key : beans.keySet()) {
+//                object = beans.get(key);
+//                classes.add(object);
+//            }
+//        } catch (Exception e) {
+//            log.error("get implBeans exception:{};", Throwables.getStackTraceAsString(e));
+//        }
+//
+//        log.debug("get implBeans request:{};response:{};", annotaion, classes);
+//        return classes;
+//    }
+//
+//    /**
+//     * 获取活动枚举
+//     *
+//     * @param T
+//     * @param activityImplEnum
+//     * @param <T>d
+//     * @return
+//     */
+//    public <T> T getActivityImpl(Class<T> T, ActivityImplEnum activityImplEnum) {
+//        try {
+//            List<Object> classes = getImplBeans(ActivityImpl.class);
+//            for (Object object : classes) {
+//
+//                ActivityImpl impl = object.getClass().getAnnotation(ActivityImpl.class);
+//                ActivityImplEnum[] activityImplEnums = impl.value();
+//                for (ActivityImplEnum at : activityImplEnums) {
+//                    if (at.equals(activityImplEnum)) {
+//                        return (T) object;
+//                    }
+//                }
+//            }
+//
+//        } catch (Exception e) {
+//            log.error("获取使用注解使用类异常：{},{}", e.getMessage(), e);
+//        }
+//        return null;
+//    }
+//}

order-application-service/src/main/java/cn/freemud/service/process/coupone/ActivityCouponImpl.java

-package cn.freemud.service.process.coupone;
-
-import cn.freemud.annotations.ActivityImpl;
-import cn.freemud.enums.ActivityImplEnum;
-import cn.freemud.service.process.ActivityProcessor;
-import org.springframework.stereotype.Component;
-
-@Component("ActivityCouponImpl")
-@ActivityImpl(value = {ActivityImplEnum.COUPON_ACTIVITY})
-public class ActivityCouponImpl extends ActivityProcessor {
-    @Override
-    public String demo1() {
-        return null;
-    }
-}
+//package cn.freemud.service.process.coupone;
+//
+//import cn.freemud.annotations.ActivityImpl;
+//import cn.freemud.enums.ActivityImplEnum;
+//import cn.freemud.service.process.ActivityProcessor;
+//import org.springframework.stereotype.Component;
+//
+//@Component("ActivityCouponImpl")
+//@ActivityImpl(value = {ActivityImplEnum.COUPON_ACTIVITY})
+//public class ActivityCouponImpl extends ActivityProcessor {
+//    @Override
+//    public String demo1() {
+//        return null;
+//    }
+//}

order-application-service/src/main/java/cn/freemud/service/process/limit/ActivityLimitImpl.java

-package cn.freemud.service.process.limit;
-
-import cn.freemud.annotations.ActivityImpl;
-import cn.freemud.enums.ActivityImplEnum;
-import cn.freemud.service.process.ActivityProcessor;
-import org.springframework.stereotype.Component;
-
-@Component("ActivityLimitImpl")
-@ActivityImpl(value = {ActivityImplEnum.LIMIT_PRICE})
-public class ActivityLimitImpl  extends ActivityProcessor {
-
-    @Override
-    public String demo1() {
-        return null;
-    }
-}
+//package cn.freemud.service.process.limit;
+//
+//import cn.freemud.annotations.ActivityImpl;
+//import cn.freemud.enums.ActivityImplEnum;
+//import cn.freemud.service.process.ActivityProcessor;
+//import org.springframework.stereotype.Component;
+//
+//@Component("ActivityLimitImpl")
+//@ActivityImpl(value = {ActivityImplEnum.LIMIT_PRICE})
+//public class ActivityLimitImpl  extends ActivityProcessor {
+//
+//    @Override
+//    public String demo1() {
+//        return null;
+//    }
+//}

order-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java

@@ -49,7 +49,7 @@ public class CouoponOnlineTest {
         String sign= SignUtil.createMD5Sign(requestDto,appSecret);
         requestDto.put("sign",sign);
         Object responseDto2 = couponOnlineClient.getCouponDetails(requestDto);
-        log.info("requestDto"+requestDto);
+        log.debug("requestDto"+requestDto);
         LogUtil.info("couponOnlineClient.getCouponDetails", gson.toJson(requestDto), gson.toJson(responseDto2));
     }
 

order-application-service/src/test/java/cn.freemud/client/EcologyAdminApplicationClientTest.java

@@ -30,12 +30,12 @@ import java.util.List;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
+@Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @EnableDiscoveryClient
 @EnableFeignClients
 @EnableAutoConfiguration
-@Slf4j
 public class EcologyAdminApplicationClientTest {
 
     @Autowired
@@ -51,7 +51,7 @@ public class EcologyAdminApplicationClientTest {
         getAuthorizerRequestDto.setPartnerId(partnerId);
         getAuthorizerRequestDto.setAuthorizerAppid(appId);
         GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
-        log.info(getTokenResponseDto.toString());
+        log.debug(getTokenResponseDto.toString());
     }
 
     @Test
@@ -64,7 +64,7 @@ public class EcologyAdminApplicationClientTest {
         GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
 
         String accessToken = getTokenResponseDto.getResult().getAccessToken();
-        log.info("token:{}", accessToken);
+        log.debug("token:{}", accessToken);
 
         GroupBuyRequest groupBuyRequest = new GroupBuyRequest();
         groupBuyRequest.setOut_trade_no("88888888");
@@ -99,6 +99,6 @@ public class EcologyAdminApplicationClientTest {
         //String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
 
         GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
-        log.info(groupBuyResponse.toString());
+        log.debug(groupBuyResponse.toString());
     }
 }

order-application-service/src/test/java/cn.freemud/client/PaymentClientTest.java

@@ -30,7 +30,6 @@
 // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
 // * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
 // */
-//@Slf4j
 //@RunWith(SpringRunner.class)
 //@SpringBootTest
 //@EnableDiscoveryClient

order-application-service/src/test/java/cn.freemud/client/StoreItemClientTest.java

@@ -51,7 +51,7 @@ public class StoreItemClientTest {
         getMenuCategoryInfoDto.setShopId("1036");
         getMenuCategoryInfoDto.setValid(true);
         GetMenuResponseDto getMenuResponseDto = storeItemClient.getMenuCategory(getMenuCategoryInfoDto);
-        log.info("jsonObject===" + new Gson().toJson(getMenuResponseDto));
+        log.debug("jsonObject===" + new Gson().toJson(getMenuResponseDto));
     }
 
 
@@ -71,7 +71,7 @@ public class StoreItemClientTest {
         getProductInfoDto.setProductInfoType(2);
         getProductInfoDto.setProductIds(productIds);
         ProductInfosDto productInfosDto = storeItemClient.listProductInfos(getProductInfoDto);
-        log.info("json==" + productInfosDto);
+        log.debug("json==" + productInfosDto);
     }
 
 

order-application-service/src/test/java/cn.freemud/client/WeChatClientTest.java

@@ -30,7 +30,6 @@
 // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
 // * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
 // */
-//@Slf4j
 //@RunWith(SpringRunner.class)
 //@SpringBootTest
 //@EnableDiscoveryClient

order-application-service/src/test/java/cn.freemud/manager/IappWxappConfigManagerTest.java

@@ -33,7 +33,7 @@ public class IappWxappConfigManagerTest {
         Gson gson = new Gson();
         String wxAppid="wxec91c5923af56886";
         OpenPlatformIappWxappConfig iappWxappConfig = iappWxappConfigManager.findIappWxappConfigByWxAppid(wxAppid);
-        log.info("iappWxappConfig=="+gson.toJson(iappWxappConfig));
+        log.debug("iappWxappConfig=="+gson.toJson(iappWxappConfig));
     }
 
 

order-application-service/src/test/java/cn.freemud/manager/PartnerManagerTest.java

@@ -37,6 +37,6 @@ public class PartnerManagerTest {
     public void selectByPartnerId(){
         String partnerId="360bb48b-5316-458a-903e-9a44c7f339b1";
         Partner partner=partnerManager.selectByPartnerId(partnerId);
-        log.info("partner=="+partner);
+        log.debug("partner=="+partner);
     }
 }

order-application-service/src/test/java/cn.freemud/service/WechatPushProcessorTest.java

@@ -12,10 +12,9 @@
  */
 package cn.freemud.service;
 
-import cn.freemud.service.process.WechatPush.WechatPushProcessor;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -28,8 +27,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 @EnableFeignClients
 @EnableAutoConfiguration
 public class WechatPushProcessorTest {
-    @Autowired
-    private WechatPushProcessor wechatPushProcessor;
 
     @Test
     public void syncStatusOrderCreateTest() {

order-application-service/src/test/java/cn/freemud/amp/service/ProduceMQServiceTest.java

@@ -24,7 +24,6 @@ import java.util.Random;
 @EnableFeignClients
 @EnableAutoConfiguration
 @ActiveProfiles("dev")
-@Slf4j
 public class ProduceMQServiceTest {
 
     @Autowired

order-management/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.3.9-SNAPSHOT</version>
+            <version>1.5.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -9,6 +9,7 @@ import cn.freemud.management.enums.MCCafeChannelEnum;
 import cn.freemud.management.enums.OrderSource;
 import cn.freemud.management.thirdparty.CouponOfflineMCCafeClient;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
@@ -29,7 +30,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Component
-@Slf4j
 public class McCafeCouponAdapter {
 
     @Autowired
@@ -64,7 +64,7 @@ public class McCafeCouponAdapter {
         McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponOfflineMCCafeClient.batchQuery(mcCafeCouponRequest);
         if (mcdNetBatchQueryResponse == null || !SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
                 || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
-            log.error("获取优惠券详情失败，无法核销", mcCafeCouponRequest, mcdNetBatchQueryResponse);
+            ApiLog.error("获取优惠券详情失败，无法核销", mcCafeCouponRequest, mcdNetBatchQueryResponse);
             return null;
         }
 

order-management/src/main/java/cn/freemud/management/controller/DeliveryOrderController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
 /**
  * 创建配送单
  */
-@Slf4j
 @RequestMapping("/order")
 @RestController
 

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @RequestMapping("/order")
 @RestController
 @Validated

order-management/src/main/java/cn/freemud/management/intercept/OrderExceptionHandler.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @RestControllerAdvice
-@Slf4j
 public class OrderExceptionHandler {
 
 

order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java

@@ -28,7 +28,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 @Service
-@Slf4j
 public class OrderBaseService {
 
     private static final int SUCCESS = 100;

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

@@ -7,8 +7,8 @@ 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.sdk.api.assortment.order.response.order.QueryOrdersResponse;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 @Component
-@Slf4j
 public class CouponHandle {
 
     public final static Integer RESPONSE_SUCCESS = 100;
@@ -37,14 +36,14 @@ public class CouponHandle {
             for (MCCafeCouponRequest mcCafeCouponRequest: list) {
                 //重试3次
                 for (int i = 2; i >= 0; i--) {
-                    log.info("核销券码入参：{}",JSONObject.toJSONString(mcCafeCouponRequest));
+                    ApiLog.info("核销券码入参：{}",JSONObject.toJSONString(mcCafeCouponRequest));
                     CouponRedeemResponse redeem = couponOfflineMCCafeClient.redeem(mcCafeCouponRequest);
-                    log.info("核销券码出参：{}",JSONObject.toJSONString(redeem));
                     if (RESPONSE_SUCCESS.equals(redeem.getStatusCode())) {
                         break;
                     }
+                    ApiLog.error("核销券码异常", mcCafeCouponRequest, redeem);
                     if (i == 0 && !RESPONSE_SUCCESS.equals(redeem.getStatusCode())) {
-                        log.error("核销券码异常，入参{}，出参：{}", JSONObject.toJSONString(mcCafeCouponRequest), JSONObject.toJSON(redeem));
+                        ApiLog.error("核销券码异常", mcCafeCouponRequest, redeem);
                     }
                 }
             }
@@ -66,7 +65,7 @@ public class CouponHandle {
                         break;
                     }
                     if (i == 0 && !RESPONSE_SUCCESS.equals(response.getStatusCode())) {
-                        log.error("解锁券码异常，入参{}，出参：{}", JSONObject.toJSONString(mcCafeCouponLockRequest), JSONObject.toJSON(response));
+                        ApiLog.error("解锁券码异常", mcCafeCouponLockRequest, response);
                     }
                 }
             }

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

@@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-@Slf4j
 @Service
 public class OrderDeliveryService {
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java

@@ -41,7 +41,6 @@ import java.util.Objects;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
  */
 @Service
-@Slf4j
 public class OrderDownLoadSdkService {
 
     @Autowired

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderManagerSdkService.java

@@ -34,7 +34,6 @@ import java.util.Objects;
  *//*
 
 @Service
-@Slf4j
 public class OrderManagerSdkService {
 
     @Autowired

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -22,7 +22,6 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoR
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.util.ResponseUtil;
 import com.freemud.application.sdk.api.util.RequestThirdPartyUtils;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,11 +30,7 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
 import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant.*;
 
 /**
@@ -51,7 +46,6 @@ import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddr
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class OrderSdkService {
 
 
@@ -705,7 +699,6 @@ public class OrderSdkService {
      * @return
      */
     public QueryByCodeResponse updateGroupOrder(GroupOrderUpdateReq groupOrderAffirmReq, String trackingNo){
-        log.info(JSONArray.toJSONString(groupOrderAffirmReq));
         QueryByCodeResponse queryByCodeResponse = RequestThirdPartyUtils.httpJsonReqComplexNew(this.restTemplate, InterfaceAddressConstant.GROUP_UPDATEORDER, createBaseRequest(groupOrderAffirmReq, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {});
         return queryByCodeResponse;
     }

platform-sdk/src/main/java/cn/freemud/platform/sdk/hualala/HualalaSdkService.java

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 
-@Slf4j
+//@Slf4j
 public class HualalaSdkService {
     @Autowired
     private CloudService cloudService;

shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java

@@ -13,6 +13,7 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +24,8 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -51,7 +54,6 @@ import java.util.Objects;
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Aspect
 @Component
 public class WebAspect {
@@ -79,6 +81,9 @@ public class WebAspect {
 
     private static final String APP_CHANNEL = "3";
 
+
+    private static Logger logger = LoggerFactory.getLogger(ApiLog.class);
+
     /**
      * 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link IgnoreFeignLogAnnotation}配置，输出响应报文里面所有的信息
      */
@@ -190,7 +195,7 @@ public class WebAspect {
                         thirdPartLogVo.getUri(), thirdPartLogVo.getRequestBody(), logReult);
             }
         } catch (Exception e) {
-            log.error("WebAspect Feign Log Ignore error {}", ExceptionUtils.getMessage(e));
+            LogUtil.error("WebAspect Feign Log Ignore error {}", "","",e);
         }
         return result;
     }

shopping-cart-application-service/src/main/java/cn/freemud/config/WebMvcConfig.java

@@ -26,7 +26,7 @@ import java.util.List;
  * WebMvcConfigurer
  */
 @Configuration
-@Slf4j
+//@Slf4j
 public class WebMvcConfig implements WebMvcConfigurer {
     @Bean
     public ObjectMapper objectMapper(){

shopping-cart-application-service/src/main/java/cn/freemud/controller/CollageOrderController.java

@@ -37,7 +37,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value = "/shoppingCart/collage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "拼单订单 controller", tags = {"拼单订单管理接口"})
-@Slf4j
 public class CollageOrderController {
     @Autowired
     private CollageOrderServiceImpl collageOrderService;

shopping-cart-application-service/src/main/java/cn/freemud/controller/MCoffeeShoppingCartController.java

@@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value = "/shoppingCart/MCoffee", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "购物车 controller", tags = {"购物车管理接口"})
-@Slf4j
 public class MCoffeeShoppingCartController {
 
     @Autowired

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java

@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value = "/shoppingCart/collage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "购物车 controller", tags = {"拼单购物车管理接口"})
-@Slf4j
 public class ShoppingCartCollageController {
 
     /**

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -53,7 +53,6 @@ import java.util.Map;
 @RestController
 @RequestMapping(value = "/shoppingCart", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "购物车 controller", tags = {"购物车管理接口"})
-@Slf4j
 public class ShoppingCartController {
 
     @Autowired

shopping-cart-application-service/src/main/java/cn/freemud/demo/controller/ShoppingCartDemoController.java

@@ -67,7 +67,6 @@ import java.util.Map;
 @RestController
 @RequestMapping(value = "/shoppingCart/demo", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "购物车 controller", tags = {"购物车管理接口"})
-@Slf4j
 public class ShoppingCartDemoController {
 
     @Autowired

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/promotion/KgdPromotionServiceImpl.java

@@ -16,13 +16,14 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.ActivityService;
 import cn.freemud.service.thirdparty.CalculationClient;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service("KgdPromotionService")
-@Slf4j
+//@Slf4j
 public class KgdPromotionServiceImpl implements PromotionService{
 
     @Autowired
@@ -43,7 +44,7 @@ public class KgdPromotionServiceImpl implements PromotionService{
         CalculationSharingDiscountRequestDto shareDiscountRequestDto = promotionBO2DTOAdapter.convert2CalculationSharingDiscountRequestDto(getCalculationDiscountBO);
         CalculationSharingDiscountResponseDto calculationSharingDiscountResponseDto = null;
         try {
-            log.info("start sharing discount dto={}", JSON.toJSONString(shareDiscountRequestDto));
+            ApiLog.debug("start sharing discount dto={}", JSON.toJSONString(shareDiscountRequestDto));
             calculationSharingDiscountResponseDto = calculationClient.calculationSharingDiscount(shareDiscountRequestDto);
         }
         catch (Exception e) {

shopping-cart-application-service/src/main/java/cn/freemud/factory/AbstractShoppingCartImpl.java

@@ -25,6 +25,7 @@ import cn.freemud.utils.PromotionFactory;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerStoreDeliveryConfig;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
@@ -67,7 +68,6 @@ import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_INVALIAD_GO
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
  */
-@Slf4j
 public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService {
 
     @Autowired
@@ -204,7 +204,7 @@ public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService
         if (StringUtils.isBlank(receiveId)) {
             return deliveryAmount;
         }
-        log.info("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
+        ApiLog.debug("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
         if (storeDeliveryUseOld) {
             deliveryAmount = Long.parseLong(getDeliveryAmount(receiveId, partnerId, storeId).toString());
             shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);

shopping-cart-application-service/src/main/java/cn/freemud/interceptor/BizExceptionHandler.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @RestControllerAdvice
-@Slf4j
 public class BizExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)

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

@@ -16,7 +16,6 @@ package cn.freemud.service.delivery.impl;
 import cn.freemud.service.delivery.DeliveryService;
 import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
 public abstract class AbstractDeliveryServiceImpl implements DeliveryService {
 
 }

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

@@ -21,6 +21,7 @@ import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIa
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIappWxappConfigManager;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -51,7 +52,6 @@ import java.util.Map;
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Service
 public class BuriedPointServiceImpl implements BuriedPointService {
     @Value("${saas.wx.service.provider.appid}")

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

@@ -42,6 +42,7 @@ import cn.freemud.service.UserService;
 import cn.freemud.service.thirdparty.*;
 import cn.freemud.utils.*;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.productcenter.constant.ResponseConstant;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
@@ -84,7 +85,6 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 @Service
-@Slf4j
 public class CouponServiceImpl implements CouponService {
 
     private final Gson gson = new Gson();
@@ -234,7 +234,7 @@ public class CouponServiceImpl implements CouponService {
         try {
             getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto);
         } catch (Exception ex) {
-            log.error("会员服务优惠券接口调用失败", ex);
+            LogUtil.error("会员服务优惠券接口调用失败", "","",ex);
         }
         if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) {
             return getMemberCouponListResponseDto.getData();
@@ -275,7 +275,7 @@ public class CouponServiceImpl implements CouponService {
 
     @Override
     public GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo) {
-        log.info("getMemberCoupon:" + gson.toJson(requestVo));
+        ApiLog.debug("getMemberCoupon:" + gson.toJson(requestVo));
         //TODO 券详情查券服务
         Map<String, String> map = new TreeMap<String, String>();
         if (StringUtils.isBlank(requestVo.getPartnerId()) || StringUtils.isBlank(requestVo.getCouponCode())) {
@@ -746,7 +746,7 @@ public class CouponServiceImpl implements CouponService {
 
     @Override
     public CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto) {
-        log.info("checkSpqInfo****" + gson.toJson(requestDto));
+        ApiLog.debug("checkSpqInfo****" + gson.toJson(requestDto));
         String partnerId = requestDto.getPartnerId();
         String couponCode = requestDto.getCouponCode();
         String storeId = requestDto.getStoreId();
@@ -819,7 +819,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setSkuName(StringUtils.isNotBlank(productsVo.getSkuName()) ? productsVo.getSkuName() : productsVo.getSpuName());
         dto.setPicture(productsVo.getSpuPicture());
         dto.setCouponType(0);
-        log.info("dto***" + dto);
+        ApiLog.debug("dto***" + dto);
         return dto;
     }
 
@@ -901,7 +901,7 @@ public class CouponServiceImpl implements CouponService {
      */
     @Override
     public CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto, String goodsId) {
-        log.info("checkSpqInfo****" + gson.toJson(requestDto));
+        ApiLog.debug("checkSpqInfo****" + gson.toJson(requestDto));
         String partnerId = requestDto.getPartnerId();
         String couponCode = requestDto.getCouponCode();
         String storeId = requestDto.getStoreId();
@@ -997,7 +997,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setExtras(productsVo.getExtra());
         dto.setCouponType(couponType);
-        log.info("dto***" + dto);
+        ApiLog.debug("dto***" + dto);
         return dto;
     }
 
@@ -1050,7 +1050,7 @@ public class CouponServiceImpl implements CouponService {
      */
     @Override
     public GetProductsVo getSpqProductInfo(CheckSpqInfoRequestDto requestDto, String goodsId) {
-        log.info("checkSpqInfo****" + gson.toJson(requestDto));
+        ApiLog.debug("checkSpqInfo****" + gson.toJson(requestDto));
         String partnerId = requestDto.getPartnerId();
         String couponCode = requestDto.getCouponCode();
         String storeId = requestDto.getStoreId();
@@ -1296,10 +1296,10 @@ public class CouponServiceImpl implements CouponService {
             }
             // 书写逻辑
             couponAvailableReqVo.setCouponCodes(calCouponCodes);
-            log.info("availableCoupon couponAvailableService.getCouponsAvailable num:{};start:{}", j, JSON.toJSONString(couponAvailableReqVo));
+            ApiLog.debug("availableCoupon couponAvailableService.getCouponsAvailable num:{};start:{}", j, JSON.toJSONString(couponAvailableReqVo));
             //CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
             CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo);
-            log.info("availableCoupon couponAvailableService.getCouponsAvailable num:{};end:{}", j, JSON.toJSONString(couponsAvailable));
+            ApiLog.debug("availableCoupon couponAvailableService.getCouponsAvailable num:{};end:{}", j, JSON.toJSONString(couponsAvailable));
             if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
                     && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {
                 couponStateList.addAll(couponsAvailable.getCouponStateList());

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

@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class FullPromotionService implements IPromotionService {
 
 //    @Autowired

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

@@ -22,7 +22,6 @@ import java.util.stream.Collectors;
  * 满减活动
  */
 @Service
-@Slf4j
 public class FullSubtractionActivityServiceImpl {
 
     private final static Gson gson = new Gson();

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

@@ -30,6 +30,7 @@ import cn.freemud.service.thirdparty.StockClient;
 import cn.freemud.service.thirdparty.StoreItemClient;
 import cn.freemud.utils.ResponseUtil;
 import cn.freemud.utils.Sha1Util;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
@@ -48,7 +49,7 @@ import java.util.stream.Collectors;
 @Service
 public class ItemServiceImpl implements ItemService {
 
-    private Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
+    private Logger log = LoggerFactory.getLogger(ApiLog.class);
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
     private static Gson gson = new Gson();

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

@@ -9,6 +9,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.service.IPromotionService;
+import com.freemud.application.sdk.api.log.ApiLog;
 import lombok.Data;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +32,6 @@ import java.util.List;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service("MaterialPromotionService")
-@Slf4j
 public class MaterialPromotionService implements IPromotionService {
     @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
@@ -83,9 +83,9 @@ public class MaterialPromotionService implements IPromotionService {
     @Override
     public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
         HashMap<String, MaterialApportion> map = getApportionGoodsDetail(calculationDiscountResult);
-        log.info("updateShoppingCartGoodsApportion->map:" + map);
+        ApiLog.debug("updateShoppingCartGoodsApportion->map:" + map);
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> products = shoppingCartGoodsDto.getProducts();
-        log.info("updateShoppingCartGoodsApportion->product:" + products);
+        ApiLog.debug("updateShoppingCartGoodsApportion->product:" + products);
         if (map.size() > 0) {
             String pk = "";
             for (ShoppingCartGoodsDto.CartGoodsDetailDto product : products) {

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

@@ -12,14 +12,16 @@ import cn.freemud.redis.RedisCache;
 import cn.freemud.service.OpenStoreIappWxappConfigService;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.utils.BeanUtil;
+import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.ResponseUtil;
+import com.freemud.application.sdk.api.log.ApiLog;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-@Slf4j
+//@Slf4j
 public class OpenStoreIappWxappConfigServiceImpl implements OpenStoreIappWxappConfigService {
 
     @Autowired
@@ -48,7 +50,7 @@ public class OpenStoreIappWxappConfigServiceImpl implements OpenStoreIappWxappCo
             }
         }catch (Exception e){
             //异常打印日常日志，返回默认config
-            log.error("getOpenStoreIappWxappConfig error {}" ,e.getMessage());
+            LogUtil.error("getOpenStoreIappWxappConfig error {}" ,"","",e);
             return ResponseUtil.success(defauleConfig);
         }
     }

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

@@ -54,7 +54,6 @@ import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 
-@Slf4j
 @Service
 public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 

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

@@ -27,7 +27,6 @@ import java.util.Comparator;
 import java.util.List;
 
 @Service
-@Slf4j
 public class ShoppingCartNewBaseServiceImpl implements ShoppingCartNewBaseService {
 
     private final CartGoodsComparator cartGoodsComparator = new CartGoodsComparator();

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

@@ -104,7 +104,6 @@ import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS
 import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS;
 import static java.util.stream.Collectors.toList;
 
-@Slf4j
 @Service
 public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
@@ -1353,7 +1352,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
         }
         try {
-            log.info("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto));
+            ApiLog.debug("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto));
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
         } catch (Exception ex) {
             ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
@@ -2294,7 +2293,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (StringUtils.isBlank(receiveId) && !Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
             return deliveryAmount;
         }
-        log.info("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
+        ApiLog.debug("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
         if (storeDeliveryUseOld) {
             deliveryAmount = Long.parseLong(getDeliveryAmount(receiveId, partnerId, storeId).toString());
             shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);
@@ -2675,7 +2674,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         try {
             getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto);
         } catch (Exception ex) {
-            log.error("会员服务优惠券接口调用失败", ex);
+            LogUtil.error("会员服务优惠券接口调用失败","","", ex);
         }
         if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) {
             return getMemberCouponListResponseDto.getData();

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

@@ -19,7 +19,6 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Slf4j
 @Service
 public class ShoppingCartToolsServiceImpl implements ShoppingCartToolsService {
 

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

@@ -16,6 +16,7 @@ import cn.freemud.enums.*;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.utils.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -46,7 +47,6 @@ import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_INVALIAD_GO
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class CalculationCommonService {
 
     /**
@@ -71,7 +71,7 @@ public class CalculationCommonService {
         /**
          * 使用促销算价赋值行记录
          */
-        log.info("initShoppingCart={},discountResult={}", JSON.toJSON(cartGoodsList),JSON.toJSON(discountResult));
+        ApiLog.debug("initShoppingCart={},discountResult={}", JSON.toJSON(cartGoodsList),JSON.toJSON(discountResult));
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = null;
         if (discountResult != null && CollectionUtils.isNotEmpty(discountResult.getGoods())) {
             goods = discountResult.getGoods();
@@ -203,7 +203,7 @@ public class CalculationCommonService {
     public ShoppingCartGoodsDto.CartGoodsDetailDto convertCartGoods2DetailGoodsList(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods calculationGoods
             , CartGoods cartGoods
             , String partnerId) {
-        log.info("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
+        ApiLog.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.convertCartGoods2DetailGoods(calculationGoods, cartGoods,partnerId);
         return cartGoodsDetailDto;
     }
@@ -217,7 +217,7 @@ public class CalculationCommonService {
      */
     public ShoppingCartApportionBO.CartGoodsDetailDto convertCartGoods2NewDetailGoodsList(CalculationDiscountBO.CalculationDiscountResult.Goods calculationGoods
             , CartGoods cartGoods, String partnerId) {
-        log.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
+        ApiLog.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
 
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods oldGoods = mapperFacade.map(calculationGoods, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.class);
 

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

@@ -29,7 +29,6 @@ import java.util.List;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class CalculationSharingCartService {
 
     @Autowired

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

@@ -23,6 +23,7 @@ import cn.freemud.service.impl.calculate.promotion.GiftSharingService;
 import cn.freemud.service.thirdparty.CalculationClient;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
@@ -50,7 +51,6 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class CalculationSharingDiscountService {
     @Autowired
     private CouponService couponService;
@@ -103,10 +103,10 @@ public class CalculationSharingDiscountService {
                 CheckSpqInfoResponseDto checkSpqInfo = null;
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                     checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
-                    log.info("coupon:{},{}", "hg", JSON.toJSONString(checkSpqInfo));
+                    ApiLog.debug("coupon:{},{}", "hg", JSON.toJSONString(checkSpqInfo));
                 } else {
                     checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
-                    log.info("coupon:{},{}", "sp", JSON.toJSONString(checkSpqInfo));
+                    ApiLog.debug("coupon:{},{}", "sp", JSON.toJSONString(checkSpqInfo));
                 }
                 if (null == checkSpqInfo) {
                     cartGoodsList.remove(i);
@@ -134,7 +134,7 @@ public class CalculationSharingDiscountService {
                     CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
                     coupon.setCode(checkSpqInfo.getCouponCode());
                     coupon.setActivityCode(checkSpqInfo.getActiveCode());
-                    log.info("coupons={},coupon={}", JSON.toJSONString(coupons), JSON.toJSONString(coupon));
+                    ApiLog.debug("coupons={},coupon={}", JSON.toJSONString(coupons), JSON.toJSONString(coupon));
                     CalculationSharingDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = coupons.stream().filter(p -> coupon.getActivityCode().equals(p.getActivityCode()) && coupon.getCode().equals(p.getCode())).findFirst().orElse(null);
                     if (calculationDiscountCoupon == null){
                         coupons.add(coupon);
@@ -183,7 +183,7 @@ public class CalculationSharingDiscountService {
         //剔除商品数量为空的
         calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
         if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
-            log.info("calculationDiscountGoodsList:{}", JSON.toJSON(calculationDiscountGoodsList));
+            ApiLog.debug("calculationDiscountGoodsList:{}", JSON.toJSON(calculationDiscountGoodsList));
             //throw new BizServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST,"参数促销计算商品有异常");
             return null;
         }
@@ -202,7 +202,7 @@ public class CalculationSharingDiscountService {
         activeService.buildChooseGoodsService(calculationSharingDiscountRequestDto,shoppingCartInfoRequestVo == null ? null : shoppingCartInfoRequestVo.getChooseGoods());
 
         try {
-            log.info("start sharing discount dto={}", JSON.toJSONString(calculationSharingDiscountRequestDto));
+            ApiLog.debug("start sharing discount dto={}", JSON.toJSONString(calculationSharingDiscountRequestDto));
             sharingDiscountResponseDto = calculationClient.calculationSharingDiscount(calculationSharingDiscountRequestDto);
         }
         catch (Exception e) {

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

@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class CalculationSharingEquallyService {
 
     @Autowired

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

@@ -25,7 +25,6 @@ import java.util.List;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class CalculationSharingValidatorService {
 
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java

@@ -12,6 +12,7 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.ItemService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
@@ -40,7 +41,6 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class AdditionSharingService {
 
     @Autowired
@@ -180,7 +180,7 @@ public class AdditionSharingService {
      */
     private ResponseResult checkAdditionalGoods(List<CreateOrderVo.PremiumExchangeActivity.Product> additionalProducts
             , List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity> additionalActivityList) {
-        log.debug("checkAdditionalGoods additionalProducts:{}<---->additionalActivityList:{}", JSON.toJSONString(additionalProducts), JSON.toJSONString(additionalActivityList));
+        ApiLog.debug("checkAdditionalGoods additionalProducts:{}<---->additionalActivityList:{}", JSON.toJSONString(additionalProducts), JSON.toJSONString(additionalActivityList));
         //无加价购活动
         if (CollectionUtils.isEmpty(additionalActivityList)) {
             return ResponseResult.PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST;
@@ -253,7 +253,7 @@ public class AdditionSharingService {
         if (getProductsVoMap.isEmpty()) {
             throw new ServiceException(ResponseResult.PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST);
         }
-        log.info("getProductsVoMap:{}", JSON.toJSONString(getProductsVoMap));
+        ApiLog.debug("getProductsVoMap:{}", JSON.toJSONString(getProductsVoMap));
         // 获取计算返回的价格
         Long originalTotalAmount = shoppingCartGoodsResponseVo.getOriginalTotalAmount();
         //Long totalAmount = shoppingCartGoodsDto.getTotalAmount();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/BuyOneGiveOneSendService.java

@@ -40,7 +40,6 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
-@Slf4j
 public class BuyOneGiveOneSendService {
 
     @Autowired

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

@@ -85,7 +85,6 @@ import static com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartC
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 
-@Slf4j
 @Service
 public class ShoppingCartMCoffeeServiceImpl {
 
@@ -224,7 +223,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
             List<CartGoods> newCartGoods = null;
             if (!StringUtils.equals("9999",skuId)) {
-                log.info("【addGoodsList】:{} ,【addGoodsRequestVo】:{}",JSONObject.toJSONString(oldCartGoodsList),JSONObject.toJSONString(addCartGoods));
+                ApiLog.debug("【addGoodsList】:{} ,【addGoodsRequestVo】:{}",JSONObject.toJSONString(oldCartGoodsList),JSONObject.toJSONString(addCartGoods));
                 // 购物车数据更新(保存商品原价)
                 newCartGoods = updateCartGoodsLegal(partnerId, storeId, orderType, tableNumber, menuType, userId, addCartGoods, shoppingCartGoodsResponseVo, oldCartGoodsList);
 
@@ -654,7 +653,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
-        log.info("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
+        ApiLog.debug("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
         CartGoods monthCardProduct = null;
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
@@ -919,7 +918,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, tableNumber, shoppingCartBaseService);
-        log.info("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
+        ApiLog.debug("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
         if (cartGoodsList == null || CollectionUtils.isEmpty(cartGoodsList)) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
         }
@@ -1032,7 +1031,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // 获取原门店购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, fromStoreId, userId, sessionId, "", shoppingCartBaseService);
-        log.info("【switchCardGoods】原门店数据: {} {}", requestVo.getSessionId(), JSONObject.toJSONString(cartGoodsList));
+        ApiLog.debug("【switchCardGoods】原门店数据: {} {}", requestVo.getSessionId(), JSONObject.toJSONString(cartGoodsList));
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -1421,7 +1420,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             nowCartGoodsList.addAll(oldCartGoodsList);
         }
         if(CollectionUtils.isNotEmpty(newCartGoodsList)){
-            log.info("【merge-before】:{} ,【newCardGoods】:{}",JSONObject.toJSONString(nowCartGoodsList),JSONObject.toJSONString(newCartGoods));
+            ApiLog.debug("【merge-before】:{} ,【newCardGoods】:{}",JSONObject.toJSONString(nowCartGoodsList),JSONObject.toJSONString(newCartGoods));
             newCartGoodsList.forEach(newCartGood -> {
                 int index;
                 if ((index = nowCartGoodsList.indexOf(newCartGood)) >= 0) {
@@ -2309,7 +2308,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 cartGoods.getMonthCardInfo().setCardCode(productBindingCouponType.getVirtualCouponCode());
                 cartGoods.getMonthCardInfo().setCardNo(productBindingCouponType.getCardId());
                 cartGoods.getMonthCardInfo().setType(cartGoods.getMonthCardInfo().getType());
-                log.info("【月享卡】信息替换成功，cartGoods:{},productInfo:{}",cartGoods.toString(),result.toString());
+                ApiLog.debug("【月享卡】信息替换成功，cartGoods:{},productInfo:{}",cartGoods.toString(),result.toString());
             }
         }
     }

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

@@ -17,6 +17,7 @@ import cn.freemud.service.thirdparty.CustomerExtendClient;
 import cn.freemud.utils.BarcodeUtil;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -42,7 +43,6 @@ import java.util.stream.Collectors;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Slf4j
 @Service
 public class CouponDiscountCalculation {
 
@@ -166,7 +166,7 @@ public class CouponDiscountCalculation {
                 }
                 List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discountsNew = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
                 if (CollectionUtils.isNotEmpty(discountsNew)) {
-                    log.info("couponDiscountCalculation:{}",discountsNew);
+                    ApiLog.debug("couponDiscountCalculation:{}",discountsNew);
                     //这里过滤掉了 月享卡2.0，因为月享卡2.0商品不用展示划线价，故显示原价
                     Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> targetDiscount =  discountsNew.stream()
                             .filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) || ActivityTypeEnum.TYPE_37.getCode().equals(t.getType())).findFirst();
@@ -387,7 +387,7 @@ public class CouponDiscountCalculation {
         try {
             getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto);
         } catch (Exception ex) {
-            log.error("会员服务优惠券接口调用失败", ex);
+            LogUtil.error("会员服务优惠券接口调用失败","","", ex);
         }
         if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) {
             return getMemberCouponListResponseDto.getData();

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

@@ -34,7 +34,6 @@ import java.util.List;
  * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
  */
 @Service
-@Slf4j
 public class MaterialCalculation {
     @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;

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

@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
-@Slf4j
 @Service("cocoShoppingCartRelationService")
 public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelationService {
 

shopping-cart-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java

@@ -49,7 +49,7 @@ public class CouoponOnlineTest {
         String sign= SignUtil.createMD5Sign(requestDto,appSecret);
         requestDto.put("sign",sign);
         Object responseDto2 = couponOnlineClient.getCouponDetails(requestDto);
-        log.info("requestDto"+requestDto);
+        log.debug("requestDto"+requestDto);
         LogUtil.info("couponOnlineClient.getCouponDetails", gson.toJson(requestDto), gson.toJson(responseDto2));
     }
 

shopping-cart-application-service/src/test/java/cn.freemud/client/StoreItemClientTest.java

@@ -51,7 +51,7 @@ public class StoreItemClientTest {
         getMenuCategoryInfoDto.setShopId("1036");
         getMenuCategoryInfoDto.setValid(true);
         GetMenuResponseDto getMenuResponseDto = storeItemClient.getMenuCategory(getMenuCategoryInfoDto);
-        log.info("jsonObject===" + new Gson().toJson(getMenuResponseDto));
+        log.debug("jsonObject===" + new Gson().toJson(getMenuResponseDto));
     }
 
 
@@ -72,7 +72,7 @@ public class StoreItemClientTest {
         getProductInfoDto.setProductInfoType(2);
         getProductInfoDto.setProductIds(productIds);
         ProductInfosDto productInfosDto = storeItemClient.listProductInfos(getProductInfoDto);
-        log.info("json==" + productInfosDto);
+        log.debug("json==" + productInfosDto);
     }
 
 

shopping-cart-application-service/src/test/java/cn.freemud/manager/IappWxappConfigManagerTest.java

@@ -33,7 +33,7 @@ public class IappWxappConfigManagerTest {
         Gson gson = new Gson();
         String wxAppid="wxec91c5923af56886";
         OpenPlatformIappWxappConfig iappWxappConfig = iappWxappConfigManager.findIappWxappConfigByWxAppid(wxAppid);
-        log.info("iappWxappConfig=="+gson.toJson(iappWxappConfig));
+        log.debug("iappWxappConfig=="+gson.toJson(iappWxappConfig));
     }
 
 

shopping-cart-application-service/src/test/java/cn.freemud/manager/PartnerManagerTest.java

@@ -34,6 +34,6 @@ public class PartnerManagerTest {
     public void selectByPartnerId(){
         String partnerId="360bb48b-5316-458a-903e-9a44c7f339b1";
         Partner partner=partnerManager.selectByPartnerId(partnerId);
-        log.info("partner=="+partner);
+        log.debug("partner=="+partner);
     }
 }

shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartMealServiceTest.java

@@ -56,7 +56,7 @@ public class ShoppingCartMealServiceTest {
         addShoppingCartGoodsRequestVo.setSessionId(sessionId);
         long startTime = System.currentTimeMillis();
         BaseResponse response = shoppingCartBaseService.addGoods(addShoppingCartGoodsRequestVo);
-        log.info("addGoods consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
+        log.debug("addGoods consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
     }
 
     @Test
@@ -73,7 +73,7 @@ public class ShoppingCartMealServiceTest {
                 "}";
         UpdateShoppingCartGoodsQtyRequestVo requestVo = JSONObject.parseObject(requestJson, UpdateShoppingCartGoodsQtyRequestVo.class);
         BaseResponse response = shoppingCartBaseService.updateGoodsQty(requestVo);
-        log.info("updateGoodsQty response:{}", JSONObject.toJSONString(response));
+        log.debug("updateGoodsQty response:{}", JSONObject.toJSONString(response));
         Assert.assertNotNull(response);
         Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
     }
@@ -81,7 +81,7 @@ public class ShoppingCartMealServiceTest {
     @Test
     public void listCartGoodsTest() {
         BaseResponse response = listCartGoods();
-        log.info("listCartGoods  response:{}", JSONObject.toJSONString(response));
+        log.debug("listCartGoods  response:{}", JSONObject.toJSONString(response));
         Assert.assertNotNull(response);
         Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
 
@@ -107,7 +107,7 @@ public class ShoppingCartMealServiceTest {
         ShoppingCartInfoRequestVo shoppingCartInfoRequestVo = JSONObject.parseObject(requestJson, ShoppingCartInfoRequestVo.class);
         CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity = new CreateOrderVo.PremiumExchangeActivity();
         BaseResponse<ShoppingCartGoodsDto> response = this.shoppingCartBaseService.getShoppingCartGoods(shoppingCartInfoRequestVo, premiumExchangeActivity);
-        log.info("getShoppingCart response:{}", JSONObject.toJSONString(response));
+        log.debug("getShoppingCart response:{}", JSONObject.toJSONString(response));
         Assert.assertNotNull(response);
         Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
     }
@@ -128,7 +128,7 @@ public class ShoppingCartMealServiceTest {
         long startTime = System.currentTimeMillis();
         CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity = new CreateOrderVo.PremiumExchangeActivity();
         BaseResponse<ShoppingCartGoodsDto> response = this.shoppingCartBaseService.getShoppingCartGoods(shoppingCartInfoRequestVo, premiumExchangeActivity);
-        log.info("getShoppingCart consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
+        log.debug("getShoppingCart consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
         Assert.assertNotNull(response);
         Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
         try {
@@ -164,7 +164,7 @@ public class ShoppingCartMealServiceTest {
         requestVo.setSessionId("unitTestMeal2");
         requestVo.setOperationType(operationEnum.getOperationType());
         BaseResponse response = this.shoppingCartBaseService.clear(requestVo);
-        log.info("clear consumeTime:{} operationType:{} response:{}", System.currentTimeMillis() - startTime, operationEnum.getOperationType(), JSONObject.toJSONString(response));
+        log.debug("clear consumeTime:{} operationType:{} response:{}", System.currentTimeMillis() - startTime, operationEnum.getOperationType(), JSONObject.toJSONString(response));
         Assert.assertNotNull(response);
         Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
     }
@@ -190,7 +190,7 @@ public class ShoppingCartMealServiceTest {
         //查询购物车
         long startTime = System.currentTimeMillis();
         BaseResponse<ShoppingCartGoodsMealResponseVo> response = listCartGoods();
-        log.info("listCartGoods consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
+        log.debug("listCartGoods consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
         Assert.assertNotNull(response);
         Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
         Integer carVer = response.getResult().getCarVer();
@@ -198,10 +198,10 @@ public class ShoppingCartMealServiceTest {
         toOrder(carVer);
         //再次查询购物车
         response = listCartGoods();
-        log.info("toOrder listCartGoods  consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
+        log.debug("toOrder listCartGoods  consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
         //清台
         this.clearAllTest();
-        log.info("查询、下单、清空 consumeTime:{}", System.currentTimeMillis() - startTime);
+        log.debug("查询、下单、清空 consumeTime:{}", System.currentTimeMillis() - startTime);
     }
 
 }

shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartNewServiceTest.java

@@ -59,7 +59,7 @@ public class ShoppingCartNewServiceTest {
         String requestJson = "{\"appId\":\"wxb78fb7c6218cb52c\",\"categoryName\":\"库存\",\"orderType\":1,\"partnerId\":\"1864\",\"productComboList\":[],\"productGroupList\":[],\"sessionId\":\"9f4da5564ee1b7d0c72a29ad854e58eb9be68c05\",\"shopId\":\"999999998\",\"skuId\":\"\",\"spuId\":\"152352063746106644\"}";
         AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo = JSONObject.parseObject(requestJson, AddShoppingCartGoodsRequestVo.class);
         BaseResponse response = shoppingCartNewService.addGoods(addShoppingCartGoodsRequestVo);
-        log.info("shoppingCartGoodsResponseVo==" + JSONObject.toJSONString(response));
+        log.debug("shoppingCartGoodsResponseVo==" + JSONObject.toJSONString(response));
 
     }
 
@@ -68,7 +68,7 @@ public class ShoppingCartNewServiceTest {
         String requestJson = "{\"appId\":\"wxb78fb7c6218cb52c\",\"cartGoodsUid\":\"4761ad89-ddf6-4063-bcfd-e59b5a42be37\",\"orderType\":1,\"partnerId\":\"1864\",\"qty\":5,\"sessionId\":\"9f4da5564ee1b7d0c72a29ad854e58eb9be68c05\",\"shopId\":\"999999998\"}";
         UpdateShoppingCartGoodsQtyRequestVo updateShoppingCartGoodsQtyRequestVo = JSONObject.parseObject(requestJson, UpdateShoppingCartGoodsQtyRequestVo.class);
         BaseResponse shoppingCartGoodsResponseVo = shoppingCartNewService.updateGoodsQty(updateShoppingCartGoodsQtyRequestVo);
-        log.info("shoppingCartGoodsResponseVo:{}" , JSONObject.toJSONString(shoppingCartGoodsResponseVo));
+        log.debug("shoppingCartGoodsResponseVo:{}" , JSONObject.toJSONString(shoppingCartGoodsResponseVo));
     }
 
     @Test
@@ -84,7 +84,7 @@ public class ShoppingCartNewServiceTest {
                 "}";
         ShoppingCartInfoRequestVo shoppingCartInfoRequestVo = JSONObject.parseObject(requestJson, ShoppingCartInfoRequestVo.class);
         BaseResponse shoppingCartGoodsResponseVo = shoppingCartNewService.getGoodsList(shoppingCartInfoRequestVo);
-        log.info("shoppingCartGoodsResponseVo==" + JSONObject.toJSONString(shoppingCartGoodsResponseVo));
+        log.debug("shoppingCartGoodsResponseVo==" + JSONObject.toJSONString(shoppingCartGoodsResponseVo));
     }
 
     @Test