Commit c8473938 by ping.wu

去掉Slf4j

parent cd844db8
...@@ -40,7 +40,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest ...@@ -40,7 +40,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.DateTimeUtils; import com.freemud.sdk.api.assortment.shoppingcart.util.DateTimeUtils;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
......
...@@ -129,7 +129,6 @@ public class OrderCallBackMQService { ...@@ -129,7 +129,6 @@ public class OrderCallBackMQService {
OrderCallBackConfig.QUEUE_ROUTING_KEY, OrderCallBackConfig.QUEUE_NAME); OrderCallBackConfig.QUEUE_ROUTING_KEY, OrderCallBackConfig.QUEUE_NAME);
MQMessage<WechatReportOrderDto> message = new MQMessage<>(header, wechatReportOrderDto); MQMessage<WechatReportOrderDto> message = new MQMessage<>(header, wechatReportOrderDto);
mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.WECHAT_ORDER_REPORT_QUEUE_ROUTING_KEY, message); mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.WECHAT_ORDER_REPORT_QUEUE_ROUTING_KEY, message);
//logger.info("orderCode:{} queue:{} content:{}", new Object[]{orderInfoReqs.getOrderCode(), "wechat-report-queue", JSONObject.toJSONString(message)});
logUtil.info("orderCode:{} queue:{} content:{}", orderInfoReqs.getOrderCode(), "wechat-report-queue", JSONObject.toJSONString(message)); logUtil.info("orderCode:{} queue:{} content:{}", orderInfoReqs.getOrderCode(), "wechat-report-queue", JSONObject.toJSONString(message));
} }
} catch (Exception ex) { } catch (Exception ex) {
......
...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; ...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -26,7 +25,6 @@ import java.util.List; ...@@ -26,7 +25,6 @@ import java.util.List;
* WebMvcConfigurer * WebMvcConfigurer
*/ */
@Configuration @Configuration
//@Slf4j
public class WebMvcConfig implements WebMvcConfigurer { public class WebMvcConfig implements WebMvcConfigurer {
@Bean @Bean
public ObjectMapper objectMapper(){ public ObjectMapper objectMapper(){
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
//import cn.freemud.base.constant.Version; //import cn.freemud.base.constant.Version;
//import cn.freemud.entities.dto.activity.ActivityQueryResponseDto; //import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
//import cn.freemud.service.thirdparty.ActivityClient; //import cn.freemud.service.thirdparty.ActivityClient;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
//package cn.freemud.manager; //package cn.freemud.manager;
// //
//import com.google.gson.Gson; //import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; ...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -28,7 +27,6 @@ import java.util.List; ...@@ -28,7 +27,6 @@ import java.util.List;
* WebMvcConfigurer * WebMvcConfigurer
*/ */
@Configuration @Configuration
//@Slf4j
public class WebMvcConfig implements WebMvcConfigurer { public class WebMvcConfig implements WebMvcConfigurer {
@Bean @Bean
public ObjectMapper objectMapper(){ public ObjectMapper objectMapper(){
......
...@@ -7,7 +7,6 @@ import cn.freemud.service.CallerService; ...@@ -7,7 +7,6 @@ import cn.freemud.service.CallerService;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
......
...@@ -5,12 +5,10 @@ import cn.freemud.entities.vo.CreateOrderVo; ...@@ -5,12 +5,10 @@ import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.QueryOrderVo; import cn.freemud.entities.vo.QueryOrderVo;
import cn.freemud.entities.vo.WechatGroupBuyVo; import cn.freemud.entities.vo.WechatGroupBuyVo;
import cn.freemud.service.impl.CollageOrderServiceImpl; import cn.freemud.service.impl.CollageOrderServiceImpl;
import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
...@@ -6,7 +6,6 @@ import cn.freemud.entities.vo.SellCouponCreateOrderVo; ...@@ -6,7 +6,6 @@ import cn.freemud.entities.vo.SellCouponCreateOrderVo;
import cn.freemud.service.impl.SellCouponOrderServiceImpl; import cn.freemud.service.impl.SellCouponOrderServiceImpl;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
...@@ -9,7 +9,6 @@ import cn.freemud.service.OrderAdapterService; ...@@ -9,7 +9,6 @@ import cn.freemud.service.OrderAdapterService;
import cn.freemud.service.Orderservice; import cn.freemud.service.Orderservice;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RequestMapping("/order") @RequestMapping("/order")
@RestController @RestController
@Validated @Validated
......
...@@ -30,7 +30,6 @@ import cn.freemud.xxljob.OrderCountJobHandler; ...@@ -30,7 +30,6 @@ import cn.freemud.xxljob.OrderCountJobHandler;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -39,7 +38,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -39,7 +38,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.Map; import java.util.Map;
@Slf4j
@RequestMapping("/order") @RequestMapping("/order")
@RestController @RestController
@Validated @Validated
......
...@@ -6,7 +6,6 @@ import cn.freemud.entities.vo.OrderStateMonitorInfoVo; ...@@ -6,7 +6,6 @@ import cn.freemud.entities.vo.OrderStateMonitorInfoVo;
import cn.freemud.service.Orderservice; import cn.freemud.service.Orderservice;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
* @Copyright: www.freemud.cn Inc. * @Copyright: www.freemud.cn Inc.
*/ */
@Api(tags = "订单状态监控") @Api(tags = "订单状态监控")
@Slf4j
@Validated @Validated
@RequestMapping("/order") @RequestMapping("/order")
@RestController @RestController
......
...@@ -5,7 +5,6 @@ import cn.freemud.entities.vo.parking.QueryParkingOrderVo; ...@@ -5,7 +5,6 @@ import cn.freemud.entities.vo.parking.QueryParkingOrderVo;
import cn.freemud.service.ParkingOrderService; import cn.freemud.service.ParkingOrderService;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
...@@ -8,7 +8,6 @@ import cn.freemud.service.SpellGroupOrderService; ...@@ -8,7 +8,6 @@ import cn.freemud.service.SpellGroupOrderService;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
*/ */
package cn.freemud.hystrix; package cn.freemud.hystrix;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
......
...@@ -5,7 +5,6 @@ import cn.freemud.base.entity.BaseResponse; ...@@ -5,7 +5,6 @@ import cn.freemud.base.entity.BaseResponse;
import cn.freemud.enums.ResponseResult; import cn.freemud.enums.ResponseResult;
import cn.freemud.inteceptor.CommonServiceException; import cn.freemud.inteceptor.CommonServiceException;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError; import org.springframework.validation.FieldError;
......
...@@ -6,7 +6,6 @@ import cn.freemud.enums.OrderType; ...@@ -6,7 +6,6 @@ import cn.freemud.enums.OrderType;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule; import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule;
import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager; import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager;
import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest; import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
...@@ -24,7 +23,6 @@ import java.util.function.Function; ...@@ -24,7 +23,6 @@ import java.util.function.Function;
* @description: TODO * @description: TODO
* @date 2021/5/31上午9:36 * @date 2021/5/31上午9:36
*/ */
@Slf4j
@Component @Component
public class OrderTackCodeManager { public class OrderTackCodeManager {
@Autowired @Autowired
......
...@@ -24,7 +24,6 @@ import com.freemud.application.sdk.api.membercenter.service.MemberCenterService; ...@@ -24,7 +24,6 @@ import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest; import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse; import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService; import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -40,7 +39,6 @@ import java.util.List; ...@@ -40,7 +39,6 @@ import java.util.List;
* @date 2021/4/15下午3:45 * @date 2021/4/15下午3:45
*/ */
@Component @Component
@Slf4j
public class SpellGroupOrderDataManager { public class SpellGroupOrderDataManager {
@Autowired @Autowired
......
...@@ -7,7 +7,6 @@ import cn.freemud.interceptor.ServiceException; ...@@ -7,7 +7,6 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.utils.AppLogUtil; import cn.freemud.utils.AppLogUtil;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse; import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Objects; import java.util.Objects;
......
...@@ -41,7 +41,6 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome ...@@ -41,7 +41,6 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest; import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse; import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService; import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -59,7 +58,6 @@ import java.util.Objects; ...@@ -59,7 +58,6 @@ import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Component @Component
@Slf4j
public class CheckMallOrder { public class CheckMallOrder {
@Autowired @Autowired
......
...@@ -58,7 +58,6 @@ import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse; ...@@ -58,7 +58,6 @@ import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService; import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
......
...@@ -515,7 +515,6 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -515,7 +515,6 @@ public class MallOrderServiceImpl implements MallOrderService {
if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) { if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) {
return sendPaySuccessNoticeMessage(); return sendPaySuccessNoticeMessage();
} }
// AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
return gson.toJson(message); return gson.toJson(message);
} }
...@@ -693,7 +692,6 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -693,7 +692,6 @@ public class MallOrderServiceImpl implements MallOrderService {
if (StringUtils.isEmpty(oid)) { if (StringUtils.isEmpty(oid)) {
return; return;
} }
// AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto(); OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid); requestDto.setOid(oid);
requestDto.setOrderStatus(status); requestDto.setOrderStatus(status);
......
...@@ -540,7 +540,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -540,7 +540,6 @@ public class OrderServiceImpl implements Orderservice {
if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) { if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) {
return sendPaySuccessNoticeMessage(); return sendPaySuccessNoticeMessage();
} }
// AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
//orderRefund(orderBean, "订单异常退款", openid, oid); //orderRefund(orderBean, "订单异常退款", openid, oid);
return gson.toJson(message); return gson.toJson(message);
} }
...@@ -2054,7 +2053,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2054,7 +2053,6 @@ public class OrderServiceImpl implements Orderservice {
} }
// public void backOrdersNotifyActivity(OrderBean orderBean, List<Integer> transType) { // public void backOrdersNotifyActivity(OrderBean orderBean, List<Integer> transType) {
// LogUtil.info("backOrdersNotifyActivity", gson.toJson(orderBean), gson.toJson(transType));
// if (orderBean == null) { // if (orderBean == null) {
// return; // return;
// } // }
...@@ -2066,7 +2064,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2066,7 +2064,6 @@ public class OrderServiceImpl implements Orderservice {
// MQMessage<ActivityCancelStockRequestDto> message = new MQMessage<>(header, activityCancelStockRequestDto); // MQMessage<ActivityCancelStockRequestDto> message = new MQMessage<>(header, activityCancelStockRequestDto);
// mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message); // mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
// } catch (Exception e) { // } catch (Exception e) {
// LogUtil.error("ActivityReverse", JSON.toJSONString(activityCancelStockRequestDto), "", e);
// } // }
// } // }
......
...@@ -25,7 +25,6 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService; ...@@ -25,7 +25,6 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryOrderRequest; import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryOrderRequest;
import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryOrderResponse; import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryOrderResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService; import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
//import cn.freemud.redis.RedisCache; //import cn.freemud.redis.RedisCache;
//import cn.freemud.service.UserService; //import cn.freemud.service.UserService;
//import com.google.gson.Gson; //import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
// //
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
//import cn.freemud.service.OrderDistributeMQService; //import cn.freemud.service.OrderDistributeMQService;
//import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest; //import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
//import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService; //import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
// //
......
//package cn.freemud.service.process; //package cn.freemud.service.process;
// //
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
// //
///** ///**
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
//import cn.freemud.annotations.ActivityImpl; //import cn.freemud.annotations.ActivityImpl;
//import cn.freemud.enums.ActivityImplEnum; //import cn.freemud.enums.ActivityImplEnum;
//import com.google.common.base.Throwables; //import com.google.common.base.Throwables;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.BeansException; //import org.springframework.beans.BeansException;
//import org.springframework.context.ApplicationContext; //import org.springframework.context.ApplicationContext;
//import org.springframework.context.ApplicationContextAware; //import org.springframework.context.ApplicationContextAware;
...@@ -16,7 +15,6 @@ ...@@ -16,7 +15,6 @@
// * 描述类的作用 // * 描述类的作用
// * Created by:zhangbiao // * Created by:zhangbiao
// */ // */
//@Slf4j
//@Component //@Component
//public class AnnotationFactory implements ApplicationContextAware { //public class AnnotationFactory implements ApplicationContextAware {
// //
......
...@@ -90,14 +90,12 @@ ...@@ -90,14 +90,12 @@
// baseQueryOrderRequest.setOrderId(oId); // baseQueryOrderRequest.setOrderId(oId);
// QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); // QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
// if (null == userLoginInfoDto || null == queryOrderByIdResponse || null == queryOrderByIdResponse.getData()) { // if (null == userLoginInfoDto || null == queryOrderByIdResponse || null == queryOrderByIdResponse.getData()) {
// LogUtil.error("syncStatusOrderCreate 订单上送信息不全 终止上送", gson.toJson(userLoginInfoDto) + gson.toJson(queryOrderByIdResponse) + gson.toJson(queryOrderByIdResponse.getData()), "");
// return false; // return false;
// } // }
// QueryOrdersResponse.DataBean.OrderBean orderBean = queryOrderByIdResponse.getData(); // QueryOrdersResponse.DataBean.OrderBean orderBean = queryOrderByIdResponse.getData();
// // 获取当前商户微信支付mchId // // 获取当前商户微信支付mchId
// AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppId()); // AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppId());
// if (wxApp == null || wxApp.getMchId() == null) { // if (wxApp == null || wxApp.getMchId() == null) {
// LogUtil.error("syncStatusOrderCreate 订单上送信息 未查询到商户号", gson.toJson(wxApp), "");
// return false; // return false;
// } // }
// //
...@@ -107,14 +105,8 @@ ...@@ -107,14 +105,8 @@
// //
// //MQ消息发送 // //MQ消息发送
// disRequest = convent2DisRequest(orderBody); // disRequest = convent2DisRequest(orderBody);
// LogUtil.debug("createOrder_userLoginInfoDto", gson.toJson(userLoginInfoDto), null);
// LogUtil.debug("createOrder_bean", gson.toJson(orderBean), null);
// LogUtil.debug("createOrder_Body", gson.toJson(orderBody), null);
// LogUtil.debug("createdisRequest", gson.toJson(disRequest), null);
//
// orderDistributeMQService.messageDistribute(disRequest); // orderDistributeMQService.messageDistribute(disRequest);
// } catch (Exception e) { // } catch (Exception e) {
// LogUtil.error("syncStatusOrderCreate 微信上送,发送MQ异常", gson.toJson(disRequest), "", e);
// } // }
// return true; // return true;
// } // }
...@@ -133,7 +125,6 @@ ...@@ -133,7 +125,6 @@
// try { // try {
// AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId); // AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
// if (null == userLoginInfoDto) { // if (null == userLoginInfoDto) {
// LogUtil.error("syncStatusOrderPay 订单上送信息不全 终止上送", gson.toJson(userLoginInfoDto), "");
// return; // return;
// } // }
// // 兼容老支付逻辑 // // 兼容老支付逻辑
...@@ -142,7 +133,6 @@ ...@@ -142,7 +133,6 @@
// // 获取当前商户微信支付mchId // // 获取当前商户微信支付mchId
// AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppId()); // AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppId());
// if (wxApp == null || wxApp.getMchId() == null) { // if (wxApp == null || wxApp.getMchId() == null) {
// LogUtil.error("syncStatusOrderCreate 订单上送信息 未查询到商户号", gson.toJson(wxApp), "");
// return; // return;
// } // }
// mchId = wxApp.getMchId(); // mchId = wxApp.getMchId();
...@@ -156,7 +146,6 @@ ...@@ -156,7 +146,6 @@
// DisRequest disRequest = convent2DisRequest(orderBody); // DisRequest disRequest = convent2DisRequest(orderBody);
// orderDistributeMQService.messageDistribute(disRequest); // orderDistributeMQService.messageDistribute(disRequest);
// } catch (Exception e) { // } catch (Exception e) {
// LogUtil.info("syncStatusOrderCreate 微信上送异常", "", "", e);
// } // }
// //
// //
...@@ -228,13 +217,11 @@ ...@@ -228,13 +217,11 @@
// List<WxappPluginVo> openPlatformWxappPluginBinds = openPlatformWxappPluginBindManager.queryByWxAppid(userLoginInfoDto.getWxAppId()); // List<WxappPluginVo> openPlatformWxappPluginBinds = openPlatformWxappPluginBindManager.queryByWxAppid(userLoginInfoDto.getWxAppId());
// List<WxappPluginVo> pluginVoList = openPlatformWxappPluginBinds.stream().filter(wxappPluginVo -> wxappPluginVo.getPluginAppid().equals(COUPON_PLUGINS)).filter(wxappPluginVo -> wxappPluginVo.getOperateStatus() == 1).collect(Collectors.toList()); // List<WxappPluginVo> pluginVoList = openPlatformWxappPluginBinds.stream().filter(wxappPluginVo -> wxappPluginVo.getPluginAppid().equals(COUPON_PLUGINS)).filter(wxappPluginVo -> wxappPluginVo.getOperateStatus() == 1).collect(Collectors.toList());
// if (CollectionUtils.isEmpty(pluginVoList) || pluginVoList.size() != 1) { // if (CollectionUtils.isEmpty(pluginVoList) || pluginVoList.size() != 1) {
// LogUtil.error("checkWechatOpenPlugin 订单上送信息 未开启优惠插件", gson.toJson(pluginVoList), "");
// return true; // return true;
// } // }
// WxappPluginVo wxappPluginVo = pluginVoList.get(0); // WxappPluginVo wxappPluginVo = pluginVoList.get(0);
// //
// if (!Objects.equals(wxappPluginVo.getAuditStatus(), PluginAuditStatusEnum.PASS.getCode()) || !Objects.equals(wxappPluginVo.getOperateStatus(), YesOrNoEnum.YES.getCode())) { // if (!Objects.equals(wxappPluginVo.getAuditStatus(), PluginAuditStatusEnum.PASS.getCode()) || !Objects.equals(wxappPluginVo.getOperateStatus(), YesOrNoEnum.YES.getCode())) {
// LogUtil.error("checkWechatOpenPlugin 订单上送信息 未开启优惠插件", gson.toJson(wxappPluginVo), "");
// return true; // return true;
// } // }
// return false; // return false;
......
...@@ -88,7 +88,6 @@ import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest; ...@@ -88,7 +88,6 @@ import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse; import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService; import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -113,7 +112,6 @@ import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.R ...@@ -113,7 +112,6 @@ import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.R
* @date 2018/05/08 * @date 2018/05/08
*/ */
@Service @Service
@Slf4j
public abstract class UniversalOrderService { public abstract class UniversalOrderService {
@Autowired @Autowired
......
...@@ -7,10 +7,8 @@ import cn.freemud.service.thirdparty.CardBinClient; ...@@ -7,10 +7,8 @@ import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient; import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.AppLogUtil; import cn.freemud.utils.AppLogUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
//import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.application.sdk.api.util.SignUtil; import com.freemud.application.sdk.api.util.SignUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -24,7 +22,6 @@ import java.util.Arrays; ...@@ -24,7 +22,6 @@ import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
//import cn.freemud.service.thirdparty.CouponClient; //import cn.freemud.service.thirdparty.CouponClient;
//import cn.freemud.service.thirdparty.CouponOfflineClient; //import cn.freemud.service.thirdparty.CouponOfflineClient;
//import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSON;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
...@@ -19,9 +18,7 @@ ...@@ -19,9 +18,7 @@
//import java.util.*; //import java.util.*;
//import java.util.function.Predicate; //import java.util.function.Predicate;
//import java.util.stream.Collectors; //import java.util.stream.Collectors;
// ////@RunWith(SpringRunner.class)
//@Slf4j
//@RunWith(SpringRunner.class)
//@SpringBootTest //@SpringBootTest
//@EnableDiscoveryClient //@EnableDiscoveryClient
//@EnableFeignClients //@EnableFeignClients
......
...@@ -3,7 +3,6 @@ package cn.freemud.client; ...@@ -3,7 +3,6 @@ package cn.freemud.client;
import cn.freemud.entities.dto.GetMemberCouponListRequestDto; import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
import cn.freemud.entities.dto.GetMemberCouponListResponseDto; import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
import cn.freemud.service.thirdparty.CustomerExtendClient; import cn.freemud.service.thirdparty.CustomerExtendClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -15,7 +14,6 @@ import org.springframework.test.context.junit4.SpringRunner; ...@@ -15,7 +14,6 @@ import org.springframework.test.context.junit4.SpringRunner;
import java.util.ArrayList; import java.util.ArrayList;
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
...@@ -7,7 +7,6 @@ import cn.freemud.service.thirdparty.EcologyAdminApplicationClient; ...@@ -7,7 +7,6 @@ import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
import cn.freemud.service.thirdparty.WeChatClient; import cn.freemud.service.thirdparty.WeChatClient;
import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest; import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest;
import com.freemud.sdk.api.assortment.order.response.order.GroupBuyResponse; import com.freemud.sdk.api.assortment.order.response.order.GroupBuyResponse;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -30,7 +29,6 @@ import java.util.List; ...@@ -30,7 +29,6 @@ import java.util.List;
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved. * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
...@@ -51,7 +49,6 @@ public class EcologyAdminApplicationClientTest { ...@@ -51,7 +49,6 @@ public class EcologyAdminApplicationClientTest {
getAuthorizerRequestDto.setPartnerId(partnerId); getAuthorizerRequestDto.setPartnerId(partnerId);
getAuthorizerRequestDto.setAuthorizerAppid(appId); getAuthorizerRequestDto.setAuthorizerAppid(appId);
GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto); GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
log.debug(getTokenResponseDto.toString());
} }
@Test @Test
...@@ -64,7 +61,6 @@ public class EcologyAdminApplicationClientTest { ...@@ -64,7 +61,6 @@ public class EcologyAdminApplicationClientTest {
GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto); GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
String accessToken = getTokenResponseDto.getResult().getAccessToken(); String accessToken = getTokenResponseDto.getResult().getAccessToken();
log.debug("token:{}", accessToken);
GroupBuyRequest groupBuyRequest = new GroupBuyRequest(); GroupBuyRequest groupBuyRequest = new GroupBuyRequest();
groupBuyRequest.setOut_trade_no("88888888"); groupBuyRequest.setOut_trade_no("88888888");
...@@ -99,6 +95,5 @@ public class EcologyAdminApplicationClientTest { ...@@ -99,6 +95,5 @@ public class EcologyAdminApplicationClientTest {
//String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken; //String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest); GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
log.debug(groupBuyResponse.toString());
} }
} }
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
//import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSON;
//import com.alibaba.fastjson.JSONObject; //import com.alibaba.fastjson.JSONObject;
//import com.google.gson.Gson; //import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
...@@ -27,7 +26,6 @@ ...@@ -27,7 +26,6 @@
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved. // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 // * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
// */ // */
//@Slf4j
//@RunWith(SpringRunner.class) //@RunWith(SpringRunner.class)
//@SpringBootTest //@SpringBootTest
//@EnableDiscoveryClient //@EnableDiscoveryClient
......
...@@ -5,7 +5,6 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto; ...@@ -5,7 +5,6 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.application.sdk.api.structure.request.PushMessageTokenDto; import com.freemud.application.sdk.api.structure.request.PushMessageTokenDto;
import com.freemud.application.sdk.api.structure.service.MessageCenterClient; import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -26,9 +25,7 @@ import org.springframework.test.context.junit4.SpringRunner; ...@@ -26,9 +25,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* @date: 2018/6/25 10:58 * @date: 2018/6/25 10:58
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */@RunWith(SpringRunner.class)
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
@EnableFeignClients @EnableFeignClients
......
package cn.freemud.client; package cn.freemud.client;
import cn.freemud.entities.dto.GetWxappAccessTokenDto; import cn.freemud.entities.dto.GetWxappAccessTokenDto;
//import cn.freemud.service.thirdparty.OpenPlatformClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -12,7 +10,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; ...@@ -12,7 +10,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
////import cn.freemud.service.thirdparty.PaymentClient; ////import cn.freemud.service.thirdparty.PaymentClient;
//import com.google.common.collect.Lists; //import com.google.common.collect.Lists;
//import com.google.gson.Gson; //import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
//import cn.freemud.entities.dto.GetProductStockRequestDto; //import cn.freemud.entities.dto.GetProductStockRequestDto;
//import cn.freemud.entities.dto.GetProductStockResponseDto; //import cn.freemud.entities.dto.GetProductStockResponseDto;
//import cn.freemud.entities.dto.UpdateProductStockRequestDto; //import cn.freemud.entities.dto.UpdateProductStockRequestDto;
//import cn.freemud.service.thirdparty.StockClient; //import cn.freemud.service.thirdparty.StockClient;//import org.junit.Test;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.autoconfigure.EnableAutoConfiguration; //import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
...@@ -31,7 +29,6 @@ ...@@ -31,7 +29,6 @@
//import java.util.Date; //import java.util.Date;
//import java.util.List; //import java.util.List;
// //
//@Slf4j
//@RunWith(SpringRunner.class) //@RunWith(SpringRunner.class)
//@SpringBootTest //@SpringBootTest
//@EnableDiscoveryClient //@EnableDiscoveryClient
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
// //
//import cn.freemud.entities.dto.*; //import cn.freemud.entities.dto.*;
//import cn.freemud.service.thirdparty.StoreClient; //import cn.freemud.service.thirdparty.StoreClient;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
...@@ -26,7 +25,6 @@ ...@@ -26,7 +25,6 @@
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved. // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 // * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
// */ // */
//@Slf4j
//@RunWith(SpringRunner.class) //@RunWith(SpringRunner.class)
//@SpringBootTest //@SpringBootTest
//@EnableDiscoveryClient //@EnableDiscoveryClient
......
...@@ -3,9 +3,7 @@ package cn.freemud.client; ...@@ -3,9 +3,7 @@ package cn.freemud.client;
import cn.freemud.entities.dto.*; import cn.freemud.entities.dto.*;
import cn.freemud.service.thirdparty.StoreItemClient; import cn.freemud.service.thirdparty.StoreItemClient;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gson.Gson; import com.google.gson.Gson;import org.junit.Test;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
...@@ -28,7 +26,6 @@ import java.util.List; ...@@ -28,7 +26,6 @@ import java.util.List;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
//import cn.freemud.entities.dto.WechatSendMessageDto; //import cn.freemud.entities.dto.WechatSendMessageDto;
//import cn.freemud.service.thirdparty.WeChatClient; //import cn.freemud.service.thirdparty.WeChatClient;
//import com.google.gson.Gson; //import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -14,14 +14,12 @@ package cn.freemud.manager; ...@@ -14,14 +14,12 @@ package cn.freemud.manager;
import cn.freemud.entities.db.OpenPlatformIappWxappConfig; import cn.freemud.entities.db.OpenPlatformIappWxappConfig;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
public class IappWxappConfigManagerTest { public class IappWxappConfigManagerTest {
......
...@@ -3,7 +3,6 @@ package cn.freemud.manager; ...@@ -3,7 +3,6 @@ package cn.freemud.manager;
import cn.freemud.adapter.OrderAdapter; import cn.freemud.adapter.OrderAdapter;
import cn.freemud.entities.db.Partner; import cn.freemud.entities.db.Partner;
import cn.freemud.service.impl.StoreServiceImpl; import cn.freemud.service.impl.StoreServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -22,7 +21,6 @@ import org.springframework.test.context.junit4.SpringRunner; ...@@ -22,7 +21,6 @@ import org.springframework.test.context.junit4.SpringRunner;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
public class PartnerManagerTest { public class PartnerManagerTest {
......
...@@ -4,7 +4,6 @@ import cn.freemud.adapter.OrderAdapter; ...@@ -4,7 +4,6 @@ import cn.freemud.adapter.OrderAdapter;
import cn.freemud.entities.db.Partner; import cn.freemud.entities.db.Partner;
import cn.freemud.enums.OrderTackCodeFactory; import cn.freemud.enums.OrderTackCodeFactory;
import cn.freemud.service.impl.StoreServiceImpl; import cn.freemud.service.impl.StoreServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,7 +24,6 @@ import java.util.function.Function; ...@@ -25,7 +24,6 @@ import java.util.function.Function;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
public class TackCodeManagerTest { public class TackCodeManagerTest {
...@@ -39,6 +37,5 @@ public class TackCodeManagerTest { ...@@ -39,6 +37,5 @@ public class TackCodeManagerTest {
public void selectTackCode(){ public void selectTackCode(){
String code = orderTackCodeManager.generateTackCode(5,"1864","1000221",null, OrderTackCodeFactory.getByOrderClient("2").getGenerateTackCodeFunc()); String code = orderTackCodeManager.generateTackCode(5,"1864","1000221",null, OrderTackCodeFactory.getByOrderClient("2").getGenerateTackCodeFunc());
log.debug("code=="+code);
} }
} }
...@@ -5,7 +5,6 @@ import cn.freemud.amqp.MQAction; ...@@ -5,7 +5,6 @@ import cn.freemud.amqp.MQAction;
import cn.freemud.amqp.MQMessage; import cn.freemud.amqp.MQMessage;
import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto; import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -14,9 +14,7 @@ import com.freemud.application.sdk.api.ordercenter.util.LogUtil; ...@@ -14,9 +14,7 @@ import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType; import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
import com.freemud.sdk.api.assortment.order.enums.OrderSourceType; import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType; import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
import com.freemud.sdk.api.assortment.order.request.order.CreateOrderAccountRequest;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse; import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -6,7 +6,6 @@ import cn.freemud.management.service.impl.OrderDeliveryService; ...@@ -6,7 +6,6 @@ import cn.freemud.management.service.impl.OrderDeliveryService;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
...@@ -2,7 +2,6 @@ package cn.freemud.management.intercept; ...@@ -2,7 +2,6 @@ package cn.freemud.management.intercept;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.management.util.ResponseUtil; import cn.freemud.management.util.ResponseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
......
...@@ -5,10 +5,8 @@ import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundRespo ...@@ -5,10 +5,8 @@ import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundRespo
import cn.freemud.management.thirdparty.OMSActivityClient; import cn.freemud.management.thirdparty.OMSActivityClient;
import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant; import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse; import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Slf4j
@Component @Component
public class ActivityHandle { public class ActivityHandle {
......
...@@ -7,9 +7,6 @@ import cn.freemud.platform.sdk.hualala.request.*; ...@@ -7,9 +7,6 @@ import cn.freemud.platform.sdk.hualala.request.*;
import cn.freemud.platform.sdk.hualala.response.GetPaySubjectResponse; import cn.freemud.platform.sdk.hualala.response.GetPaySubjectResponse;
import cn.freemud.platform.sdk.hualala.response.SubmitOrderNewResponse; import cn.freemud.platform.sdk.hualala.response.SubmitOrderNewResponse;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -26,11 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -26,11 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
//@Slf4j
public class HualalaSdkService { public class HualalaSdkService {
@Autowired @Autowired
private CloudService cloudService; private CloudService cloudService;
private Logger logger = LoggerFactory.getLogger(getClass()); // private Logger logger = LoggerFactory.getLogger(getClass());
public HualalaSdkService(CloudService cloudService) { public HualalaSdkService(CloudService cloudService) {
this.cloudService = cloudService; this.cloudService = cloudService;
...@@ -55,10 +51,10 @@ public class HualalaSdkService { ...@@ -55,10 +51,10 @@ public class HualalaSdkService {
String body = getRequestBodyStr(finalRequest, baseConfig.getMerchantSecret()); String body = getRequestBodyStr(finalRequest, baseConfig.getMerchantSecret());
requestHeader.setRequestBody(body); requestHeader.setRequestBody(body);
requestHeader.setSignature(sign); requestHeader.setSignature(sign);
logger.info("桂源铺推送哗啦啦请求体:{} trackingNo:{},orderCode:{},requestHeader:{}", // logger.info("桂源铺推送哗啦啦请求体:{} trackingNo:{},orderCode:{},requestHeader:{}",
JSONObject.toJSONString(finalRequest), trackingNo, requestBody.getThirdOrderID(), JSONObject.toJSONString(requestHeader)); // JSONObject.toJSONString(finalRequest), trackingNo, requestBody.getThirdOrderID(), JSONObject.toJSONString(requestHeader));
SubmitOrderNewResponse submitOrderNewResponse = cloudService.doSend(trackingNo, "https://www-openapi.hualala.com/order/submitordernew", requestHeader, SubmitOrderNewResponse.class); SubmitOrderNewResponse submitOrderNewResponse = cloudService.doSend(trackingNo, "https://www-openapi.hualala.com/order/submitordernew", requestHeader, SubmitOrderNewResponse.class);
logger.info("桂源铺推送哗啦啦响应体:{} trackingNo:{},orderCode:{}", JSONObject.toJSONString(submitOrderNewResponse), trackingNo, requestBody.getThirdOrderID()); // logger.info("桂源铺推送哗啦啦响应体:{} trackingNo:{},orderCode:{}", JSONObject.toJSONString(submitOrderNewResponse), trackingNo, requestBody.getThirdOrderID());
return submitOrderNewResponse; return submitOrderNewResponse;
} }
...@@ -72,7 +68,7 @@ public class HualalaSdkService { ...@@ -72,7 +68,7 @@ public class HualalaSdkService {
String body = getRequestBodyStr(requestBody, "i28cUu3v"); String body = getRequestBodyStr(requestBody, "i28cUu3v");
requestHeader.setRequestBody(body); requestHeader.setRequestBody(body);
requestHeader.setSignature(sign); requestHeader.setSignature(sign);
logger.info("requestBody:{} trackingNo:{}", JSONObject.toJSONString(requestBody), trackingNo); // logger.info("requestBody:{} trackingNo:{}", JSONObject.toJSONString(requestBody), trackingNo);
GetPaySubjectResponse submitOrderNewResponse = cloudService.doSend(trackingNo, "https://www-openapi.hualala.com/doc/getPaySubject", requestHeader, GetPaySubjectResponse.class); GetPaySubjectResponse submitOrderNewResponse = cloudService.doSend(trackingNo, "https://www-openapi.hualala.com/doc/getPaySubject", requestHeader, GetPaySubjectResponse.class);
return submitOrderNewResponse; return submitOrderNewResponse;
} }
......
...@@ -30,7 +30,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant; ...@@ -30,7 +30,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest; import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
......
package cn.freemud.aop; package cn.freemud.aop;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
...@@ -23,7 +21,6 @@ import java.util.Optional; ...@@ -23,7 +21,6 @@ import java.util.Optional;
*/ */
@Aspect @Aspect
@Component @Component
@Slf4j
public class IsConvertEnAspect implements Ordered { public class IsConvertEnAspect implements Ordered {
@Pointcut("@annotation(cn.freemud.annotations.IsConvertEN)") @Pointcut("@annotation(cn.freemud.annotations.IsConvertEN)")
public void pointcut() { public void pointcut() {
......
...@@ -8,17 +8,13 @@ import cn.freemud.inteceptor.CommonServiceException; ...@@ -8,17 +8,13 @@ import cn.freemud.inteceptor.CommonServiceException;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import cn.freemud.utils.LogUtil; import cn.freemud.utils.LogUtil;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformConfig; import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformConfig;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo; import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformConfigManager; import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformConfigManager;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager; import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.ThirdPartyLog; import com.freemud.application.sdk.api.log.ThirdPartyLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature; import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
...@@ -55,7 +51,6 @@ import java.util.Objects; ...@@ -55,7 +51,6 @@ import java.util.Objects;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@Aspect @Aspect
@Component @Component
public class WebAspect { public class WebAspect {
...@@ -84,8 +79,6 @@ public class WebAspect { ...@@ -84,8 +79,6 @@ public class WebAspect {
private static final String APP_CHANNEL = "3"; private static final String APP_CHANNEL = "3";
private static Logger logger = LoggerFactory.getLogger(ShoppingSdkLogUtil.class);
/** /**
* 是否打印响应报文日志,默认是false,若为true会覆盖注解里面的{@link IgnoreFeignLogAnnotation}配置,输出响应报文里面所有的信息 * 是否打印响应报文日志,默认是false,若为true会覆盖注解里面的{@link IgnoreFeignLogAnnotation}配置,输出响应报文里面所有的信息
*/ */
...@@ -172,8 +165,6 @@ public class WebAspect { ...@@ -172,8 +165,6 @@ public class WebAspect {
try { try {
result = joinPoint.proceed(); result = joinPoint.proceed();
} catch (Exception ex) { } catch (Exception ex) {
ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
throw ex; throw ex;
} }
try { try {
...@@ -183,7 +174,6 @@ public class WebAspect { ...@@ -183,7 +174,6 @@ public class WebAspect {
msig = (MethodSignature) sig; msig = (MethodSignature) sig;
Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes()); Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
Object logReult = result; Object logReult = result;
ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
// 打印第三方出参日志 // 打印第三方出参日志
if (!this.printFeignResponseBodyLogForShopCart) { if (!this.printFeignResponseBodyLogForShopCart) {
IgnoreFeignLogAnnotation logIgnore = currentMethod.getAnnotation(IgnoreFeignLogAnnotation.class); IgnoreFeignLogAnnotation logIgnore = currentMethod.getAnnotation(IgnoreFeignLogAnnotation.class);
...@@ -203,7 +193,6 @@ public class WebAspect { ...@@ -203,7 +193,6 @@ public class WebAspect {
thirdPartLogVo.getUri(), thirdPartLogVo.getRequestBody(), logReult); thirdPartLogVo.getUri(), thirdPartLogVo.getRequestBody(), logReult);
} }
} catch (Exception e) { } catch (Exception e) {
LogUtil.error("WebAspect Feign Log Ignore error {}", "","",e);
} }
return result;*/ return result;*/
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
...@@ -264,8 +253,6 @@ public class WebAspect { ...@@ -264,8 +253,6 @@ public class WebAspect {
* try { * try {
* result = joinPoint.proceed(); * result = joinPoint.proceed();
* } catch (Exception ex) { * } catch (Exception ex) {
* ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
* LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
* throw ex; * throw ex;
* } * }
* try { * try {
...@@ -276,7 +263,6 @@ public class WebAspect { ...@@ -276,7 +263,6 @@ public class WebAspect {
* Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes()); * Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
* <p> * <p>
* Object logReult = result; * Object logReult = result;
* ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
* // 打印第三方出参日志 * // 打印第三方出参日志
* if (!this.printFeignResponseBodyLog) { * if (!this.printFeignResponseBodyLog) {
* IgnoreFeignLogAnnotation logIgnore = currentMethod.getAnnotation(IgnoreFeignLogAnnotation.class); * IgnoreFeignLogAnnotation logIgnore = currentMethod.getAnnotation(IgnoreFeignLogAnnotation.class);
......
...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; ...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -26,7 +25,6 @@ import java.util.List; ...@@ -26,7 +25,6 @@ import java.util.List;
* WebMvcConfigurer * WebMvcConfigurer
*/ */
@Configuration @Configuration
//@Slf4j
public class WebMvcConfig implements WebMvcConfigurer { public class WebMvcConfig implements WebMvcConfigurer {
@Bean @Bean
public ObjectMapper objectMapper(){ public ObjectMapper objectMapper(){
......
...@@ -20,7 +20,6 @@ import com.freemud.application.sdk.api.log.LogParams; ...@@ -20,7 +20,6 @@ import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
......
...@@ -7,7 +7,6 @@ import cn.freemud.service.impl.mcoffee.entity.*; ...@@ -7,7 +7,6 @@ import cn.freemud.service.impl.mcoffee.entity.*;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
......
...@@ -22,7 +22,6 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare; ...@@ -22,7 +22,6 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
......
...@@ -49,7 +49,6 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare; ...@@ -49,7 +49,6 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ApiAnnotation; import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams; import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MapperFacade;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
......
...@@ -24,11 +24,8 @@ import cn.freemud.interceptor.ServiceException; ...@@ -24,11 +24,8 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import cn.freemud.service.thirdparty.CardBinClient; import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient; import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.RedisUtil; import cn.freemud.utils.RedisUtil;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType; import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
//import com.freemud.card.sdk.comm.Finals;
//import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.application.sdk.api.util.SignUtil; import com.freemud.application.sdk.api.util.SignUtil;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
...@@ -104,7 +101,6 @@ public class KgdCouponServiceImpl implements CouponService { ...@@ -104,7 +101,6 @@ public class KgdCouponServiceImpl implements CouponService {
// 如果是商品券/换购券,获取券信息 // 如果是商品券/换购券,获取券信息
CouponDetailBO couponDetail = getCouponDetail(getCouponDetail); CouponDetailBO couponDetail = getCouponDetail(getCouponDetail);
// LogUtil.info(LogTreadLocal.getTrackingNo(), "KgdCouponServiceImpl.getCouponDetail", JsonUtil.toJSONString(getCouponDetail), JsonUtil.toJSONString(couponDetail));
if (couponDetail == null || !couponDetail.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetail.getDetails())) { if (couponDetail == null || !couponDetail.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetail.getDetails())) {
return null; return null;
...@@ -160,7 +156,6 @@ public class KgdCouponServiceImpl implements CouponService { ...@@ -160,7 +156,6 @@ public class KgdCouponServiceImpl implements CouponService {
GetProductBySkuIdBO getProductBySkuIdBO = convert2GetProductBySkuIdBO(getCheckSpqBo,skuId); GetProductBySkuIdBO getProductBySkuIdBO = convert2GetProductBySkuIdBO(getCheckSpqBo,skuId);
Map<String, GetProductBySkuIdResponseBO> productsInfoBySkuIds = productManager.getProductsInfoBySkuIds(getProductBySkuIdBO, getCheckSpqBo.getProductService()); Map<String, GetProductBySkuIdResponseBO> productsInfoBySkuIds = productManager.getProductsInfoBySkuIds(getProductBySkuIdBO, getCheckSpqBo.getProductService());
// LogUtil.info(LogTreadLocal.getTrackingNo(), "getProductBySkuIdBO >>>>", JsonUtil.toJSONString(getProductBySkuIdBO), JsonUtil.toJSONString(couponDetail));
GetProductBySkuIdResponseBO productsVo = productsInfoBySkuIds.get(skuId); GetProductBySkuIdResponseBO productsVo = productsInfoBySkuIds.get(skuId);
if (null == productsVo || !Objects.equals(productsVo.getStatus(), StoreItemStatus.PUT_ON_SALE.getCode())) { if (null == productsVo || !Objects.equals(productsVo.getStatus(), StoreItemStatus.PUT_ON_SALE.getCode())) {
return null; return null;
......
...@@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service("KgdPromotionService") @Service("KgdPromotionService")
//@Slf4j
public class KgdPromotionServiceImpl implements PromotionService{ public class KgdPromotionServiceImpl implements PromotionService{
@Autowired @Autowired
......
...@@ -104,19 +104,15 @@ public abstract class AbstractAddGoodsService implements AddGoodsService { ...@@ -104,19 +104,15 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
public final ShoppingCartGoodsBO addGoods(BaseAddGoodsBO addGoodsBO) { public final ShoppingCartGoodsBO addGoods(BaseAddGoodsBO addGoodsBO) {
// 基本参数校验 // 基本参数校验
this.checkParams(addGoodsBO); this.checkParams(addGoodsBO);
// LogUtil.info("addGoodsBO >>> ",JsonUtil.toJSONString(addGoodsBO),null);
// 获取购物车和加车商品信息 // 获取购物车和加车商品信息
CheckBussinessRulesBO checkBussinessRulesBO = this.getShoppingCartInfo(addGoodsBO); CheckBussinessRulesBO checkBussinessRulesBO = this.getShoppingCartInfo(addGoodsBO);
// LogUtil.info("getShoppingCartInfo >>> ",JsonUtil.toJSONString(addGoodsBO),JsonUtil.toJSONString(checkBussinessRulesBO));
// 业务校验,例如商品数量库存之类的信息 // 业务校验,例如商品数量库存之类的信息
AddGoodsToShoppingCartBO addGoodsToShoppingCartBO = this.checkBusinessRules(addGoodsBO, checkBussinessRulesBO); AddGoodsToShoppingCartBO addGoodsToShoppingCartBO = this.checkBusinessRules(addGoodsBO, checkBussinessRulesBO);
// LogUtil.info("checkBusinessRules >>> ",JsonUtil.toJSONString(addGoodsBO),JsonUtil.toJSONString(addGoodsToShoppingCartBO));
// 添加商品到购物车 // 添加商品到购物车
DiscountResultBO discountResultBO = this.addGoodsToShoppingCart(addGoodsBO, addGoodsToShoppingCartBO); DiscountResultBO discountResultBO = this.addGoodsToShoppingCart(addGoodsBO, addGoodsToShoppingCartBO);
// LogUtil.info("addGoodsToShoppingCart >>> ",JsonUtil.toJSONString(Arrays.asList(addGoodsBO,addGoodsToShoppingCartBO)),JsonUtil.toJSONString(discountResultBO));
// 去促销计算优惠 // 去促销计算优惠
CalCostBO calCostBO = this.getDiscountResult(addGoodsBO, discountResultBO); CalCostBO calCostBO = this.getDiscountResult(addGoodsBO, discountResultBO);
...@@ -215,7 +211,6 @@ public abstract class AbstractAddGoodsService implements AddGoodsService { ...@@ -215,7 +211,6 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
GetProductBO getProductBO = convert2ProductBO(baseRequestBO, spqBO); GetProductBO getProductBO = convert2ProductBO(baseRequestBO, spqBO);
// 获取商品信息 // 获取商品信息
List<ProductBO> productsInfoList = productManager.getProductsInfo(getProductBO, baseRequestBO.getManagerService().getProductService()); List<ProductBO> productsInfoList = productManager.getProductsInfo(getProductBO, baseRequestBO.getManagerService().getProductService());
// LogUtil.info(LogTreadLocal.getTrackingNo(), "getProductsInfo >>>", JsonUtil.toJSONString(getProductBO), JsonUtil.toJSONString(productsInfoList));
ProductBO productsInfo = productsInfoList.get(0); ProductBO productsInfo = productsInfoList.get(0);
bo.setProduct(productsInfo); bo.setProduct(productsInfo);
...@@ -333,9 +328,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService { ...@@ -333,9 +328,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
*/ */
public final AddGoodsToShoppingCartBO checkBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) { public final AddGoodsToShoppingCartBO checkBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) {
AddGoodsToShoppingCartBO commAddGoodsToShoppingCartBO = this.checkCommBusinessRules(baseRequestDTO, checkBussinessRulesBO); AddGoodsToShoppingCartBO commAddGoodsToShoppingCartBO = this.checkCommBusinessRules(baseRequestDTO, checkBussinessRulesBO);
// LogUtil.info("checkCommBusinessRules >>> ",JsonUtil.toJSONString(Arrays.asList(baseRequestDTO,checkBussinessRulesBO)),JsonUtil.toJSONString(commAddGoodsToShoppingCartBO));
AddGoodsToShoppingCartBO customAddGoodsToShoppingCartBO = this.checkCustomBusinessRules(baseRequestDTO, checkBussinessRulesBO, commAddGoodsToShoppingCartBO); AddGoodsToShoppingCartBO customAddGoodsToShoppingCartBO = this.checkCustomBusinessRules(baseRequestDTO, checkBussinessRulesBO, commAddGoodsToShoppingCartBO);
// LogUtil.info("checkCustomBusinessRules >>> ",JsonUtil.toJSONString(Arrays.asList(baseRequestDTO,checkBussinessRulesBO)),JsonUtil.toJSONString(customAddGoodsToShoppingCartBO));
return customAddGoodsToShoppingCartBO; return customAddGoodsToShoppingCartBO;
} }
...@@ -366,7 +359,6 @@ public abstract class AbstractAddGoodsService implements AddGoodsService { ...@@ -366,7 +359,6 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
private AddGoodsToShoppingCartBO checkCommBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) { private AddGoodsToShoppingCartBO checkCommBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) {
AddGoodsToShoppingCartBO bo = new AddGoodsToShoppingCartBO(); AddGoodsToShoppingCartBO bo = new AddGoodsToShoppingCartBO();
// LogUtil.info("checkCommBusinessRules111 >>> ",JsonUtil.toJSONString(Arrays.asList(baseRequestDTO,checkBussinessRulesBO)),null);
//购物车添加数量限制 //购物车添加数量限制
CartGoods addGoods = baseRequestDTO.getAddGoods(); CartGoods addGoods = baseRequestDTO.getAddGoods();
...@@ -386,11 +378,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService { ...@@ -386,11 +378,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
// 检查校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品 // 检查校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
ShoppingCartContext cartContext = convert2ShopingCartContext(baseRequestDTO); ShoppingCartContext cartContext = convert2ShopingCartContext(baseRequestDTO);
// LogUtil.info("checkShoppingCart1111 >>> ",JsonUtil.toJSONString(Arrays.asList(checkBussinessRulesBO)),null);
// LogUtil.info("checkShoppingCart2222 >>> ",JsonUtil.toJSONString(Arrays.asList(addGoods)),null);
// LogUtil.info("checkShoppingCart3333 >>> ",JsonUtil.toJSONString(Arrays.asList(cartContext)),null);
CheckCartRequest checkCartRequest = shoppingBaseService.checkShoppingCart(checkBussinessRulesBO.getCartGoods(), addGoods, cartContext); CheckCartRequest checkCartRequest = shoppingBaseService.checkShoppingCart(checkBussinessRulesBO.getCartGoods(), addGoods, cartContext);
// LogUtil.info("checkShoppingCart >>> ",null,JsonUtil.toJSONString(checkCartRequest));
checkBussinessRulesBO.setChanged(checkCartRequest.getChanged()); checkBussinessRulesBO.setChanged(checkCartRequest.getChanged());
checkBussinessRulesBO.setToastMsg(checkCartRequest.getToastMsg()); checkBussinessRulesBO.setToastMsg(checkCartRequest.getToastMsg());
......
...@@ -913,7 +913,6 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe ...@@ -913,7 +913,6 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
} }
} catch (Exception ex) { } catch (Exception ex) {
ErrorLog.errorConvertJson(this.getClass(),"getScoreValueFail",ex); ErrorLog.errorConvertJson(this.getClass(),"getScoreValueFail",ex);
// LogUtil.error("getScoreValueFail", "", "", ex);
} }
return result; return result;
} }
......
...@@ -42,7 +42,6 @@ import com.freemud.application.sdk.api.storecenter.service.StoreCenterService; ...@@ -42,7 +42,6 @@ import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService; import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
......
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
// */ // */
//package cn.freemud.hystrix; //package cn.freemud.hystrix;
// //
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
// //
//@Slf4j
//@Component //@Component
//public class MemberClientFallbackFactory { //public class MemberClientFallbackFactory {
// //
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
//import cn.freemud.entities.dto.SendSmsCodeResponseDto; //import cn.freemud.entities.dto.SendSmsCodeResponseDto;
////import cn.freemud.service.thirdparty.ShortMessageClient; ////import cn.freemud.service.thirdparty.ShortMessageClient;
//import feign.hystrix.FallbackFactory; //import feign.hystrix.FallbackFactory;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
// //
///** ///**
...@@ -19,7 +18,6 @@ ...@@ -19,7 +18,6 @@
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved. // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 // * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
// */ // */
//@Slf4j
//@Component //@Component
//public class ShortMessageClientFallbackFactory implements FallbackFactory<ShortMessageClient> { //public class ShortMessageClientFallbackFactory implements FallbackFactory<ShortMessageClient> {
// @Override // @Override
......
...@@ -5,7 +5,6 @@ import cn.freemud.base.entity.BaseResponse; ...@@ -5,7 +5,6 @@ import cn.freemud.base.entity.BaseResponse;
import cn.freemud.enums.ResponseResult; import cn.freemud.enums.ResponseResult;
import cn.freemud.inteceptor.CommonServiceException; import cn.freemud.inteceptor.CommonServiceException;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError; import org.springframework.validation.FieldError;
......
...@@ -158,7 +158,6 @@ public interface ShoppingCartNewService { ...@@ -158,7 +158,6 @@ public interface ShoppingCartNewService {
CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType); CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType);
CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class); CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, goodsId); CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, goodsId);
// LogUtil.info("validCoupon.CheckSpqInfoResponseDto", JSON.toJSONString(checkSpqInfoRequestDto),JSON.toJSONString(checkSpqInfoResponseDto));
if (checkSpqInfoResponseDto == null) { if (checkSpqInfoResponseDto == null) {
throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_MIX_NOT_EXIST); throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_MIX_NOT_EXIST);
} }
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
package cn.freemud.service.delivery.impl; package cn.freemud.service.delivery.impl;
import cn.freemud.service.delivery.DeliveryService; import cn.freemud.service.delivery.DeliveryService;
import lombok.extern.slf4j.Slf4j;
public abstract class AbstractDeliveryServiceImpl implements DeliveryService { public abstract class AbstractDeliveryServiceImpl implements DeliveryService {
......
...@@ -15,7 +15,6 @@ import cn.freemud.redis.RedisCache; ...@@ -15,7 +15,6 @@ import cn.freemud.redis.RedisCache;
import cn.freemud.service.BuriedPointService; import cn.freemud.service.BuriedPointService;
import cn.freemud.service.UserService; import cn.freemud.service.UserService;
//import cn.freemud.service.thirdparty.SyncTxProductClient; //import cn.freemud.service.thirdparty.SyncTxProductClient;
import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappConfig; import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappConfig;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp; import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
...@@ -242,7 +241,6 @@ public class BuriedPointServiceImpl implements BuriedPointService { ...@@ -242,7 +241,6 @@ public class BuriedPointServiceImpl implements BuriedPointService {
// String strOptRequestDto = new Gson().toJson(optRequestDto); // String strOptRequestDto = new Gson().toJson(optRequestDto);
// dto.setOpt2(strOptRequestDto); // dto.setOpt2(strOptRequestDto);
// String str = syncTxProductClient.BuriedPoint(dto); // String str = syncTxProductClient.BuriedPoint(dto);
// LogUtil.info("syncTxProductClient.BuriedPoint_BuriedPointPayment after", dto, str);
// } // }
// } catch (Exception e) { // } catch (Exception e) {
// } // }
...@@ -333,7 +331,6 @@ public class BuriedPointServiceImpl implements BuriedPointService { ...@@ -333,7 +331,6 @@ public class BuriedPointServiceImpl implements BuriedPointService {
// String strOptRequestDto = new Gson().toJson(optRequestDto); // String strOptRequestDto = new Gson().toJson(optRequestDto);
// dto.setOpt2(strOptRequestDto); // dto.setOpt2(strOptRequestDto);
// String str = syncTxProductClient.BuriedPoint(dto); // String str = syncTxProductClient.BuriedPoint(dto);
// LogUtil.info("buriedPoint after", dto, str);
// } // }
// } catch (Exception e) { // } catch (Exception e) {
// } // }
......
...@@ -12,7 +12,6 @@ import cn.freemud.enums.CouponFlag; ...@@ -12,7 +12,6 @@ import cn.freemud.enums.CouponFlag;
import cn.freemud.enums.GoodsTypeEnum; import cn.freemud.enums.GoodsTypeEnum;
import cn.freemud.service.CouponService; import cn.freemud.service.CouponService;
import cn.freemud.service.IPromotionService; import cn.freemud.service.IPromotionService;
import cn.freemud.utils.LogUtil;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant; import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
......
...@@ -46,7 +46,6 @@ import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopPr ...@@ -46,7 +46,6 @@ import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopPr
import com.freemud.application.sdk.api.util.SignUtil; import com.freemud.application.sdk.api.util.SignUtil;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.gson.Gson; import com.google.gson.Gson;
...@@ -168,7 +167,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -168,7 +167,6 @@ public class CouponServiceImpl implements CouponService {
// if (CollectionUtils.isNotEmpty(couponList) && statusFlags.contains(0)) { // if (CollectionUtils.isNotEmpty(couponList) && statusFlags.contains(0)) {
// AddWeixinCardJudgeRequestDto requestDto = couponAdapter.convert2AddWeixinCardJudgeRequestDto(couponList, partnerId, userLoginInfoDto.getUnionId()); // AddWeixinCardJudgeRequestDto requestDto = couponAdapter.convert2AddWeixinCardJudgeRequestDto(couponList, partnerId, userLoginInfoDto.getUnionId());
// responseDto = openPlatformClient.addWeixinCardJudge(requestDto); // responseDto = openPlatformClient.addWeixinCardJudge(requestDto);
// LogUtil.info("openPlatformClient.addWeixinCardJudge**", gson.toJson(requestDto), gson.toJson(responseDto));
// } // }
// //获取券条形码 // //获取券条形码
// Map<String, String> couponBarCodeMap = getCouponBarCodeMap(couponList); // Map<String, String> couponBarCodeMap = getCouponBarCodeMap(couponList);
...@@ -207,7 +205,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -207,7 +205,6 @@ public class CouponServiceImpl implements CouponService {
// list.add(cardCodeAdd); // list.add(cardCodeAdd);
// requestDto.setWeixinCardCodeAddsList(list); // requestDto.setWeixinCardCodeAddsList(list);
// AddWeixinCardCodeResponseDto responseDto = openPlatformClient.addWeiXinCardCode(requestDto); // AddWeixinCardCodeResponseDto responseDto = openPlatformClient.addWeiXinCardCode(requestDto);
// LogUtil.info("openPlatformClient.addWeiXinCardCode**", gson.toJson(requestDto), gson.toJson(responseDto));
// if (!responseDto.getCode().equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR)) { // if (!responseDto.getCode().equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR)) {
// throw new ServiceException(ResponseResult.COUPON_NOT_ADD_WEIXIN_CARD); // throw new ServiceException(ResponseResult.COUPON_NOT_ADD_WEIXIN_CARD);
// } // }
...@@ -227,7 +224,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -227,7 +224,6 @@ public class CouponServiceImpl implements CouponService {
getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto); getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto);
} catch (Exception ex) { } catch (Exception ex) {
ErrorLog.errorConvertJson(this.getClass(),"会员服务优惠券接口调用失败",ex); ErrorLog.errorConvertJson(this.getClass(),"会员服务优惠券接口调用失败",ex);
// LogUtil.error("会员服务优惠券接口调用失败", "","",ex);
} }
if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) { if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) {
return getMemberCouponListResponseDto.getData(); return getMemberCouponListResponseDto.getData();
...@@ -262,7 +258,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -262,7 +258,6 @@ public class CouponServiceImpl implements CouponService {
// public BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo) { // public BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo) {
// MemberAddCouponVo memberAddCouponVo = couponAdapter.convert2MemberAddCouponVo(requestVo); // MemberAddCouponVo memberAddCouponVo = couponAdapter.convert2MemberAddCouponVo(requestVo);
// MemberBaseRespVo memberBaseRespVo = memberProductService.receiveMemberCoupon(memberAddCouponVo); // MemberBaseRespVo memberBaseRespVo = memberProductService.receiveMemberCoupon(memberAddCouponVo);
// LogUtil.info("memberProductService.receiveMemberCoupon***", memberAddCouponVo, memberBaseRespVo);
// return ResponseUtil.success(memberBaseRespVo); // return ResponseUtil.success(memberBaseRespVo);
// } // }
...@@ -308,7 +303,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -308,7 +303,6 @@ public class CouponServiceImpl implements CouponService {
// String sign = SignUtil.createMD5Sign(map, appSecret); // String sign = SignUtil.createMD5Sign(map, appSecret);
// map.put(Finals.SIGN, sign); // map.put(Finals.SIGN, sign);
// GetCouponDetailResponseDto responseDto = couponOnlineMCCafeClient.getMCCafeCouponDetails(map); // GetCouponDetailResponseDto responseDto = couponOnlineMCCafeClient.getMCCafeCouponDetails(map);
// LogUtil.info("couponOnlineClient.getCouponDetails****", map, gson.toJson(responseDto));
// if (ResponseCodeConstant.RESPONSE_SUCCESS_1.equals(responseDto.getResult())) { // if (ResponseCodeConstant.RESPONSE_SUCCESS_1.equals(responseDto.getResult())) {
// return responseDto; // return responseDto;
// } // }
...@@ -346,7 +340,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -346,7 +340,6 @@ public class CouponServiceImpl implements CouponService {
String sign = SignUtil.createMD5Sign(map, appSecret); String sign = SignUtil.createMD5Sign(map, appSecret);
map.put(Finals.SIGN, sign); map.put(Finals.SIGN, sign);
GetCouponDetailResponseDto responseDto = couponOnlineClient.getCouponDetails(map); GetCouponDetailResponseDto responseDto = couponOnlineClient.getCouponDetails(map);
// LogUtil.info("couponOnlineClient.getCouponDetails****", map, gson.toJson(responseDto));
if (ResponseCodeConstant.RESPONSE_SUCCESS_1.equals(responseDto.getResult())) { if (ResponseCodeConstant.RESPONSE_SUCCESS_1.equals(responseDto.getResult())) {
details.addAll(responseDto.getDetails()); details.addAll(responseDto.getDetails());
} }
...@@ -450,7 +443,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -450,7 +443,6 @@ public class CouponServiceImpl implements CouponService {
getMemberCouponListRequestDto.setPageNum(1); getMemberCouponListRequestDto.setPageNum(1);
getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE); getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto); GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto);
// LogUtil.debug("CouponServiceImpl_getMemberCouponList", JSON.toJSONString(getMemberCouponListRequestDto), JSON.toJSONString(result));
List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = Lists.newArrayList(); List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = Lists.newArrayList();
// 过滤优惠券得点餐方式 // 过滤优惠券得点餐方式
if (!Objects.isNull(result) && CollectionUtils.isNotEmpty(result.getMemberCoupons())) { if (!Objects.isNull(result) && CollectionUtils.isNotEmpty(result.getMemberCoupons())) {
...@@ -534,7 +526,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -534,7 +526,6 @@ public class CouponServiceImpl implements CouponService {
couponAvailableReqVo.setCouponCodes(calCouponCodes); couponAvailableReqVo.setCouponCodes(calCouponCodes);
//CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret); //CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo); CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo);
// LogUtil.info("availableCoupon_couponAvailableService.getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable));
if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode()) if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
&& CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) { && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {
couponStateList.addAll(couponsAvailable.getCouponStateList()); couponStateList.addAll(couponsAvailable.getCouponStateList());
...@@ -546,10 +537,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -546,10 +537,6 @@ public class CouponServiceImpl implements CouponService {
private ActivityClassifyCouponBean returnSuccessAvailiableCoupons(Set<String> couponCodes, boolean hasGoodsCoupon, ActivityClassifyCouponBean availableCouponResponseVo, List<ActivityCouponBean> usableCoupons, private ActivityClassifyCouponBean returnSuccessAvailiableCoupons(Set<String> couponCodes, boolean hasGoodsCoupon, ActivityClassifyCouponBean availableCouponResponseVo, List<ActivityCouponBean> usableCoupons,
List<ActivityCouponBean> disableCoupons, Map<String, GetMemberCouponListResponseDto.Result.MemberCoupon> memberCouponMap, List<ActivityCouponBean> disableCoupons, Map<String, GetMemberCouponListResponseDto.Result.MemberCoupon> memberCouponMap,
List<CouponStateVo> couponStateList, String chooseCouponCode) { List<CouponStateVo> couponStateList, String chooseCouponCode) {
// LogUtil.info("returnSuccessAvailiableCoupons 01 couponCode : hasGoodsCoupon", couponCodes,hasGoodsCoupon);
// LogUtil.info("returnSuccessAvailiableCoupons 02 availableCouponResponseVo : usableCoupons", availableCouponResponseVo,usableCoupons);
// LogUtil.info("returnSuccessAvailiableCoupons 03 disableCoupons : memberCouponMap", disableCoupons,memberCouponMap);
// LogUtil.info("returnSuccessAvailiableCoupons 04 couponStateList : chooseCouponCode", couponStateList,chooseCouponCode);
int disableCouponNum = 0; int disableCouponNum = 0;
int usableCouponNum = 0; int usableCouponNum = 0;
for (CouponStateVo couponStateVo : couponStateList) { for (CouponStateVo couponStateVo : couponStateList) {
...@@ -769,7 +756,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -769,7 +756,6 @@ public class CouponServiceImpl implements CouponService {
requestVo.setCouponCode(couponCode); requestVo.setCouponCode(couponCode);
requestVo.setStoreId(requestDto.getStoreId()); requestVo.setStoreId(requestDto.getStoreId());
GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo); GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
// LogUtil.info("couponService.getMemberCoupon", gson.toJson(requestVo), gson.toJson(couponDetailResponseDto));
if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) { if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
return null; return null;
} }
...@@ -1018,7 +1004,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -1018,7 +1004,6 @@ public class CouponServiceImpl implements CouponService {
requestVo.setCouponCode(couponCode); requestVo.setCouponCode(couponCode);
requestVo.setStoreId(requestDto.getStoreId()); requestVo.setStoreId(requestDto.getStoreId());
GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo); GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
// LogUtil.info("couponService.getMemberCoupon", gson.toJson(requestVo), gson.toJson(couponDetailResponseDto));
if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) { if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
return null; return null;
} }
...@@ -1141,7 +1126,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -1141,7 +1126,6 @@ public class CouponServiceImpl implements CouponService {
// .build(); // .build();
// // 领券调用统一查询接口不需要关心 appid, 和 点餐方式 // // 领券调用统一查询接口不需要关心 appid, 和 点餐方式
// ActivityQueryResponseDto activityQueryResponseDto = activityClient.query(activityQueryRequestDto); // ActivityQueryResponseDto activityQueryResponseDto = activityClient.query(activityQueryRequestDto);
// LogUtil.debug("CouponServiceImpl_createCoupon", JSON.toJSONString(activityQueryRequestDto), JSON.toJSONString(activityQueryResponseDto));
// if (Objects.equals(activityQueryResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode()) // if (Objects.equals(activityQueryResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())
// && CollectionUtils.isNotEmpty(activityQueryResponseDto.getResult())) { // && CollectionUtils.isNotEmpty(activityQueryResponseDto.getResult())) {
// Long now = System.currentTimeMillis(); // Long now = System.currentTimeMillis();
......
...@@ -162,7 +162,6 @@ public class CustomerScoreService implements IPromotionService { ...@@ -162,7 +162,6 @@ public class CustomerScoreService implements IPromotionService {
} }
} catch (Exception ex) { } catch (Exception ex) {
ErrorLog.errorConvertJson(this.getClass(),"getScoreValueFail",ex); ErrorLog.errorConvertJson(this.getClass(),"getScoreValueFail",ex);
// LogUtil.error("getScoreValueFail", "", "", ex);
} }
return result; return result;
} }
......
...@@ -11,7 +11,6 @@ import cn.freemud.service.ActivityService; ...@@ -11,7 +11,6 @@ import cn.freemud.service.ActivityService;
import cn.freemud.service.IPromotionService; import cn.freemud.service.IPromotionService;
import cn.freemud.utils.WebUtil; import cn.freemud.utils.WebUtil;
import lombok.experimental.var; import lombok.experimental.var;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -7,10 +7,8 @@ import cn.freemud.entities.vo.ActivityList; ...@@ -7,10 +7,8 @@ import cn.freemud.entities.vo.ActivityList;
import cn.freemud.enums.ActivityTypeEnum; import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.enums.GiftTypeEnum; import cn.freemud.enums.GiftTypeEnum;
import cn.freemud.service.ActivityService; import cn.freemud.service.ActivityService;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.WebUtil; import cn.freemud.utils.WebUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -39,10 +37,8 @@ public class FullSubtractionActivityServiceImpl { ...@@ -39,10 +37,8 @@ public class FullSubtractionActivityServiceImpl {
*/ */
public PromotionMessageDto getFullPromotionActivityInfo(ActivityQueryDto activityQueryDto, Long totalAmount, boolean hasOtherDiscount) { public PromotionMessageDto getFullPromotionActivityInfo(ActivityQueryDto activityQueryDto, Long totalAmount, boolean hasOtherDiscount) {
totalAmount = totalAmount == null ? 0L : totalAmount; totalAmount = totalAmount == null ? 0L : totalAmount;
// LogUtil.info("getFullPromotionActivityInfo", gson.toJson(activityQueryDto) + "_" + totalAmount + "_" + hasOtherDiscount, null);
ActivityQueryResponseDto activityQueryResponseDto = activityService.queryActivitys(activityQueryDto, null, null); ActivityQueryResponseDto activityQueryResponseDto = activityService.queryActivitys(activityQueryDto, null, null);
if (activityQueryResponseDto == null) { if (activityQueryResponseDto == null) {
// LogUtil.info("queryActivitys is error", gson.toJson(activityQueryDto), gson.toJson(activityQueryResponseDto));
return null; return null;
} }
PromotionMessageDto promotionMessageDto = new PromotionMessageDto(); PromotionMessageDto promotionMessageDto = new PromotionMessageDto();
......
...@@ -11,7 +11,6 @@ import cn.freemud.entities.vo.*; ...@@ -11,7 +11,6 @@ import cn.freemud.entities.vo.*;
import cn.freemud.enums.GoodsTypeEnum; import cn.freemud.enums.GoodsTypeEnum;
import cn.freemud.service.IPromotionService; import cn.freemud.service.IPromotionService;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.Data; import lombok.Data;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -12,19 +12,16 @@ import cn.freemud.redis.RedisCache; ...@@ -12,19 +12,16 @@ import cn.freemud.redis.RedisCache;
import cn.freemud.service.OpenStoreIappWxappConfigService; import cn.freemud.service.OpenStoreIappWxappConfigService;
import cn.freemud.service.thirdparty.CustomerApplicationClient; import cn.freemud.service.thirdparty.CustomerApplicationClient;
import cn.freemud.utils.BeanUtil; import cn.freemud.utils.BeanUtil;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo; import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager; import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
//@Slf4j
public class OpenStoreIappWxappConfigServiceImpl implements OpenStoreIappWxappConfigService { public class OpenStoreIappWxappConfigServiceImpl implements OpenStoreIappWxappConfigService {
@Autowired @Autowired
......
...@@ -9,11 +9,7 @@ import cn.freemud.manager.OpenPlatformIappWxappConfigManager; ...@@ -9,11 +9,7 @@ import cn.freemud.manager.OpenPlatformIappWxappConfigManager;
import cn.freemud.manager.OpenPlatformWxappManager; import cn.freemud.manager.OpenPlatformWxappManager;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import cn.freemud.service.RecommendService; import cn.freemud.service.RecommendService;
//import cn.freemud.service.thirdparty.RecommendClient;
import cn.freemud.utils.LogUtil;
import com.google.common.collect.Maps;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -34,7 +30,6 @@ import java.util.concurrent.TimeUnit; ...@@ -34,7 +30,6 @@ import java.util.concurrent.TimeUnit;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@Service @Service
public class RecommendServiceImpl implements RecommendService { public class RecommendServiceImpl implements RecommendService {
@Value("${saas.wx.service.provider.appid}") @Value("${saas.wx.service.provider.appid}")
...@@ -94,7 +89,6 @@ public class RecommendServiceImpl implements RecommendService { ...@@ -94,7 +89,6 @@ public class RecommendServiceImpl implements RecommendService {
// //固定大小传10 // //固定大小传10
// requestDto.setRecommendNum(10); // requestDto.setRecommendNum(10);
// RecommendProductResponseDto productResponseDto = recommendClient.recommendProduct(requestDto); // RecommendProductResponseDto productResponseDto = recommendClient.recommendProduct(requestDto);
// LogUtil.info("recommendClient.recommendProduct****", gson.toJson(requestDto), gson.toJson(productResponseDto));
// //不成功设置关闭状态 // //不成功设置关闭状态
// if (100 != productResponseDto.getCode()) { // if (100 != productResponseDto.getCode()) {
// responseDto.setGuessLikeStatus("2"); // responseDto.setGuessLikeStatus("2");
......
...@@ -59,7 +59,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartMall ...@@ -59,7 +59,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartMall
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -74,7 +73,6 @@ import java.util.stream.Collectors; ...@@ -74,7 +73,6 @@ import java.util.stream.Collectors;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
@Service @Service
@Slf4j
public class ShoppingCartMallServiceImpl implements ShoppingCartNewService { public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
......
...@@ -17,7 +17,6 @@ import cn.freemud.entities.vo.CartGoods; ...@@ -17,7 +17,6 @@ import cn.freemud.entities.vo.CartGoods;
import cn.freemud.service.ShoppingCartNewBaseService; import cn.freemud.service.ShoppingCartNewBaseService;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare; import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.BoundHashOperations; import org.springframework.data.redis.core.BoundHashOperations;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
......
...@@ -82,7 +82,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; ...@@ -82,7 +82,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest; import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService; import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import javafx.util.Pair; import javafx.util.Pair;
import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MapperFacade;
...@@ -2836,7 +2835,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -2836,7 +2835,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto); getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto);
} catch (Exception ex) { } catch (Exception ex) {
ErrorLog.errorConvertJson(this.getClass(),"会员服务优惠券接口调用失败",ex); ErrorLog.errorConvertJson(this.getClass(),"会员服务优惠券接口调用失败",ex);
// LogUtil.error("会员服务优惠券接口调用失败","","", ex);
} }
if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) { if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) {
return getMemberCouponListResponseDto.getData(); return getMemberCouponListResponseDto.getData();
...@@ -3393,10 +3391,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -3393,10 +3391,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}); });
// 获取到最新的 库存 stockLimitGoods 数据 放入 nowCartGoodsList 中 // 获取到最新的 库存 stockLimitGoods 数据 放入 nowCartGoodsList 中
// LogUtil.info("request check stock limit 002 ",stockLimitGoods,notCheckStock);
notCheckStock.addAll(stockLimitGoods); notCheckStock.addAll(stockLimitGoods);
}else { }else {
// LogUtil.info("request check stock limit fail",requestDto,null);
fullReplace = false; fullReplace = false;
} }
} }
......
...@@ -10,7 +10,6 @@ import cn.freemud.service.thirdparty.MemberToolsClient; ...@@ -10,7 +10,6 @@ import cn.freemud.service.thirdparty.MemberToolsClient;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService; import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -116,14 +116,11 @@ public class StoreServiceImpl { ...@@ -116,14 +116,11 @@ public class StoreServiceImpl {
*/ */
// public StoreResponseDto getStoreInfo(String partnerId, String storeCode) { // public StoreResponseDto getStoreInfo(String partnerId, String storeCode) {
// StoreInfoRequestDto storeInfoRequestDto = new StoreInfoRequestDto(partnerId, storeCode); // StoreInfoRequestDto storeInfoRequestDto = new StoreInfoRequestDto(partnerId, storeCode);
// LogUtil.info("getStoreInfo_request_start", gson.toJson(storeInfoRequestDto), null);
// StoreBaseResponseDto<StoreResponseDto> response; // StoreBaseResponseDto<StoreResponseDto> response;
// try { // try {
// // 根据商户ID 和 门店编码查询门店信息 // // 根据商户ID 和 门店编码查询门店信息
// response = storeClient.getStoreInfo(storeInfoRequestDto); // response = storeClient.getStoreInfo(storeInfoRequestDto);
// LogUtil.info("getStoreInfo_request_end", gson.toJson(storeInfoRequestDto), gson.toJson(response));
// if (!RESPONSE_SUCCESS_CODE.equals(response.getStatusCode()) || response.getBizVO() == null) { // if (!RESPONSE_SUCCESS_CODE.equals(response.getStatusCode()) || response.getBizVO() == null) {
// LogUtil.info("getStoreInfo 获取门店信息失败", gson.toJson(storeInfoRequestDto), gson.toJson(response));
// throw new ServiceException(ResponseResult.STORE_NOT_FOUND); // throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
// } // }
// } catch (Exception e) { // } catch (Exception e) {
...@@ -196,7 +193,6 @@ public class StoreServiceImpl { ...@@ -196,7 +193,6 @@ public class StoreServiceImpl {
storeDeliveryInfoDto.setDeliveryEndTime(hhmmss.parse(endDateTimeStr)); storeDeliveryInfoDto.setDeliveryEndTime(hhmmss.parse(endDateTimeStr));
} catch (Exception e) { } catch (Exception e) {
ErrorLog.errorConvertJson(this.getClass(), "getStoreDeliveryInfo parse deliveryHoursDay error:"+ storeDeliveryInfoDto.getDeliveryHoursDay(),e); ErrorLog.errorConvertJson(this.getClass(), "getStoreDeliveryInfo parse deliveryHoursDay error:"+ storeDeliveryInfoDto.getDeliveryHoursDay(),e);
// LogUtil.info("getStoreDeliveryInfo parse deliveryHoursDay error", storeDeliveryInfoDto.getDeliveryHoursDay(), null);
} }
} }
} }
...@@ -311,7 +307,6 @@ public class StoreServiceImpl { ...@@ -311,7 +307,6 @@ public class StoreServiceImpl {
endDate = hhmmss.parse(endDateTimeStr); endDate = hhmmss.parse(endDateTimeStr);
} catch (ParseException e) { } catch (ParseException e) {
ErrorLog.errorConvertJson(this.getClass(),endDateTimeStr,e); ErrorLog.errorConvertJson(this.getClass(),endDateTimeStr,e);
// LogUtil.info("getStoreDeliveryInfo endDate format error", endDateTimeStr, null);
return false; return false;
} }
if (endDate == null || new Date().after(endDate)) { if (endDate == null || new Date().after(endDate)) {
......
...@@ -34,7 +34,6 @@ import java.util.stream.Collectors; ...@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
@Service @Service
public class TimeSalePromotionService implements IPromotionService { public class TimeSalePromotionService implements IPromotionService {
private static Logger logger = LoggerFactory.getLogger(TimeSalePromotionService.class);
@Override @Override
public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) { public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
...@@ -118,7 +117,6 @@ public class TimeSalePromotionService implements IPromotionService { ...@@ -118,7 +117,6 @@ public class TimeSalePromotionService implements IPromotionService {
// numberMap.put(cartGoods.getSkuId(), goods.getActualGoodsNumber()); // numberMap.put(cartGoods.getSkuId(), goods.getActualGoodsNumber());
// } // }
Integer actualGoodsNumber = goodsDiscount.getActualGoodsNumber(); Integer actualGoodsNumber = goodsDiscount.getActualGoodsNumber();
logger.info("测试 goodid{},actualGoodsNumber",cartGoods.getCartGoodsUid(),actualGoodsNumber);
if (actualGoodsNumber > 0) { if (actualGoodsNumber > 0) {
// Long totalDiscountAmount = cartGoods.getQty() > actualGoodsNumber ? goodsDiscount.getDiscount() * actualGoodsNumber / goodsDiscount.getActualGoodsNumber() : goodsDiscount.getDiscount() * cartGoods.getQty() / goodsDiscount.getActualGoodsNumber(); // Long totalDiscountAmount = cartGoods.getQty() > actualGoodsNumber ? goodsDiscount.getDiscount() * actualGoodsNumber / goodsDiscount.getActualGoodsNumber() : goodsDiscount.getDiscount() * cartGoods.getQty() / goodsDiscount.getActualGoodsNumber();
//Long totalDiscountAmount = cartGoods.getQty() > actualGoodsNumber ? goods.getDiscountAmount() * actualGoodsNumber / goods.getActualGoodsNumber() : goods.getDiscountAmount() * cartGoods.getQty() / goods.getActualGoodsNumber(); //Long totalDiscountAmount = cartGoods.getQty() > actualGoodsNumber ? goods.getDiscountAmount() * actualGoodsNumber / goods.getActualGoodsNumber() : goods.getDiscountAmount() * cartGoods.getQty() / goods.getActualGoodsNumber();
......
...@@ -28,7 +28,6 @@ import com.freemud.application.sdk.api.log.ErrorLog; ...@@ -28,7 +28,6 @@ import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant; import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -13,7 +13,6 @@ import cn.freemud.enums.OrderChannelType; ...@@ -13,7 +13,6 @@ import cn.freemud.enums.OrderChannelType;
import cn.freemud.enums.CouponStatus; import cn.freemud.enums.CouponStatus;
import cn.freemud.service.impl.calculate.promotion.*; import cn.freemud.service.impl.calculate.promotion.*;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -8,7 +8,6 @@ import cn.freemud.entities.vo.CouponPromotionVO; ...@@ -8,7 +8,6 @@ import cn.freemud.entities.vo.CouponPromotionVO;
import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo; import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
import cn.freemud.entities.vo.ShoppingCartInfoRequestVo; import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
import cn.freemud.service.impl.calculate.promotion.BuyOneGiveOneSendService; import cn.freemud.service.impl.calculate.promotion.BuyOneGiveOneSendService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -17,7 +17,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -17,7 +17,6 @@ import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO; 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.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
......
...@@ -167,7 +167,6 @@ public class ScoreSharingService { ...@@ -167,7 +167,6 @@ public class ScoreSharingService {
} }
} catch (Exception ex) { } catch (Exception ex) {
ErrorLog.errorConvertJson(this.getClass(),"getScoreValueFail",ex); ErrorLog.errorConvertJson(this.getClass(),"getScoreValueFail",ex);
// LogUtil.error("getScoreValueFail", "", "", ex);
} }
return result; return result;
} }
......
...@@ -53,7 +53,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseServi ...@@ -53,7 +53,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseServi
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -83,7 +82,6 @@ import static com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartC ...@@ -83,7 +82,6 @@ import static com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartC
*/ */
@Service @Service
@Slf4j
public class ShoppingCartMCoffeeServiceImpl { public class ShoppingCartMCoffeeServiceImpl {
@Autowired @Autowired
......
package cn.freemud.service.impl.mcoffee.calculation; package cn.freemud.service.impl.mcoffee.calculation;
import cn.freemud.adapter.ActivityAdapter;
import cn.freemud.adapter.ShoppingCartConvertAdapter;
import cn.freemud.adapter.ShoppingCartMccafeAdapter; import cn.freemud.adapter.ShoppingCartMccafeAdapter;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant; import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.*; import cn.freemud.entities.dto.ActivityCalculationDiscountRequestDto;
import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
import cn.freemud.entities.dto.GetMenuResponseDto;
import cn.freemud.entities.dto.activity.ActivityDiscountsDto; import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
import cn.freemud.entities.dto.activity.ActivityQueryDto; import cn.freemud.entities.dto.activity.ActivityQueryDto;
import cn.freemud.entities.dto.activity.ShareDiscountActivityDto; import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
...@@ -13,40 +13,32 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto; ...@@ -13,40 +13,32 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.*; import cn.freemud.entities.vo.*;
import cn.freemud.enums.ActivityChannelEnum; import cn.freemud.enums.ActivityChannelEnum;
import cn.freemud.enums.ActivityTypeEnum; import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.enums.GoodsTypeEnum;
import cn.freemud.enums.ResponseResult; import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException; import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.CommonService; import cn.freemud.service.CommonService;
import cn.freemud.service.impl.ItemServiceImpl; import cn.freemud.service.impl.ItemServiceImpl;
import cn.freemud.service.thirdparty.ActivityClient; import cn.freemud.service.thirdparty.ActivityClient;
import cn.freemud.utils.ExceptionUtils;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.PropertyConvertUtil; import cn.freemud.utils.PropertyConvertUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ErrorLog;
//import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest; import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse; import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
import com.freemud.application.sdk.api.membercenter.service.MemberCenterService; import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest; import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse; import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService; import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* All rights Reserved, Designed By www.freemud.cn * All rights Reserved, Designed By www.freemud.cn
* *
...@@ -61,7 +53,6 @@ import java.util.stream.Collectors; ...@@ -61,7 +53,6 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
@Slf4j
public class CalculationServiceImpl { public class CalculationServiceImpl {
......
...@@ -22,7 +22,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -22,7 +22,6 @@ import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -49,7 +48,6 @@ import java.util.stream.Collectors; ...@@ -49,7 +48,6 @@ import java.util.stream.Collectors;
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Service @Service
@Slf4j
public class CouponDiscountCalculation { public class CouponDiscountCalculation {
@Autowired @Autowired
...@@ -455,7 +453,6 @@ public class CouponDiscountCalculation { ...@@ -455,7 +453,6 @@ public class CouponDiscountCalculation {
getMemberCouponListRequestDto.setPageNum(1); getMemberCouponListRequestDto.setPageNum(1);
getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE); getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto); GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto);
// LogUtil.debug("CouponServiceImpl_getMemberCouponList", JSON.toJSONString(getMemberCouponListRequestDto), JSON.toJSONString(result));
if (result == null || CollectionUtils.isEmpty(result.getMemberCoupons())) { if (result == null || CollectionUtils.isEmpty(result.getMemberCoupons())) {
return null; return null;
} }
...@@ -502,7 +499,6 @@ public class CouponDiscountCalculation { ...@@ -502,7 +499,6 @@ public class CouponDiscountCalculation {
getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto); getMemberCouponListResponseDto = customerExtendClient.getMemberCouponListRequestDto(getMemberCouponListRequestDto);
} catch (Exception ex) { } catch (Exception ex) {
ErrorLog.errorConvertJson(this.getClass(),"会员服务优惠券接口调用失败",ex); ErrorLog.errorConvertJson(this.getClass(),"会员服务优惠券接口调用失败",ex);
// LogUtil.error("会员服务优惠券接口调用失败","","", ex);
} }
if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) { if (getMemberCouponListResponseDto != null && Objects.equals(getMemberCouponListResponseDto.getCode(), ResponseResult.SUCCESS.getCode())) {
return getMemberCouponListResponseDto.getData(); return getMemberCouponListResponseDto.getData();
...@@ -549,10 +545,8 @@ public class CouponDiscountCalculation { ...@@ -549,10 +545,8 @@ public class CouponDiscountCalculation {
couponsAvailable = mCoffeeCouponClient.getCouponsAvailable(couponAvailableReqVo); couponsAvailable = mCoffeeCouponClient.getCouponsAvailable(couponAvailableReqVo);
}catch (Exception e){ }catch (Exception e){
ErrorLog.errorConvertJson(this.getClass(),JSON.toJSONString(couponAvailableReqVo),e); ErrorLog.errorConvertJson(this.getClass(),JSON.toJSONString(couponAvailableReqVo),e);
// LogUtil.error("getCouponsAvailable_error",JSON.toJSONString(couponAvailableReqVo),null,e);
throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR); throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR);
} }
// LogUtil.info("getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable));
if (couponsAvailable != null && Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode()) if (couponsAvailable != null && Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
&& CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) { && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {
couponStateList.addAll(couponsAvailable.getCouponStateList()); couponStateList.addAll(couponsAvailable.getCouponStateList());
......
...@@ -3,16 +3,9 @@ package cn.freemud.service.impl.mcoffee.calculation; ...@@ -3,16 +3,9 @@ package cn.freemud.service.impl.mcoffee.calculation;
import cn.freemud.adapter.ShoppingCartConvertAdapter; import cn.freemud.adapter.ShoppingCartConvertAdapter;
import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto; import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.CartGoods; import cn.freemud.entities.vo.CartGoods;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
import cn.freemud.enums.GoodsTypeEnum;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -5,7 +5,6 @@ import cn.freemud.entities.dto.*; ...@@ -5,7 +5,6 @@ import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ActivityQueryResponseDto; import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
import cn.freemud.enums.ActivityTypeEnum; import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.service.thirdparty.ActivityClient; import cn.freemud.service.thirdparty.ActivityClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -19,8 +18,6 @@ import java.util.ArrayList; ...@@ -19,8 +18,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
...@@ -5,12 +5,9 @@ import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto; ...@@ -5,12 +5,9 @@ import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto;
import cn.freemud.service.CouponService; import cn.freemud.service.CouponService;
import cn.freemud.service.thirdparty.CardBinClient; import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient; import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
//import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.application.sdk.api.util.SignUtil; import com.freemud.application.sdk.api.util.SignUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -24,7 +21,6 @@ import java.util.Arrays; ...@@ -24,7 +21,6 @@ import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
...@@ -61,7 +57,6 @@ public class CouoponOnlineTest { ...@@ -61,7 +57,6 @@ public class CouoponOnlineTest {
String sign = SignUtil.createMD5Sign(requestDto, appSecret); String sign = SignUtil.createMD5Sign(requestDto, appSecret);
requestDto.setSign(sign); requestDto.setSign(sign);
BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto); BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
// LogUtil.debug("batchQueryActivityInfoTest", JSON.toJSONString(requestDto), JSON.toJSONString(batchQueryActivityInfoResponseDto));
} }
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
//import cn.freemud.service.thirdparty.CouponClient; //import cn.freemud.service.thirdparty.CouponClient;
//import cn.freemud.service.thirdparty.CouponOfflineClient; //import cn.freemud.service.thirdparty.CouponOfflineClient;
//import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSON;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,7 +19,6 @@ ...@@ -20,7 +19,6 @@
//import java.util.function.Predicate; //import java.util.function.Predicate;
//import java.util.stream.Collectors; //import java.util.stream.Collectors;
// //
//@Slf4j
//@RunWith(SpringRunner.class) //@RunWith(SpringRunner.class)
//@SpringBootTest //@SpringBootTest
//@EnableDiscoveryClient //@EnableDiscoveryClient
......
...@@ -3,7 +3,6 @@ package cn.freemud.client; ...@@ -3,7 +3,6 @@ package cn.freemud.client;
import cn.freemud.entities.dto.GetMemberCouponListRequestDto; import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
import cn.freemud.entities.dto.GetMemberCouponListResponseDto; import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
import cn.freemud.service.thirdparty.CustomerExtendClient; import cn.freemud.service.thirdparty.CustomerExtendClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -15,7 +14,6 @@ import org.springframework.test.context.junit4.SpringRunner; ...@@ -15,7 +14,6 @@ import org.springframework.test.context.junit4.SpringRunner;
import java.util.ArrayList; import java.util.ArrayList;
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
//import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSON;
//import com.alibaba.fastjson.JSONObject; //import com.alibaba.fastjson.JSONObject;
//import com.google.gson.Gson; //import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test; //import org.junit.Test;
//import org.junit.runner.RunWith; //import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
...@@ -27,7 +26,6 @@ ...@@ -27,7 +26,6 @@
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved. // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 // * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
// */ // */
//@Slf4j
//@RunWith(SpringRunner.class) //@RunWith(SpringRunner.class)
//@SpringBootTest //@SpringBootTest
//@EnableDiscoveryClient //@EnableDiscoveryClient
......
...@@ -3,7 +3,6 @@ package cn.freemud.client; ...@@ -3,7 +3,6 @@ package cn.freemud.client;
import cn.freemud.entities.dto.PushMessageNoticeDto; import cn.freemud.entities.dto.PushMessageNoticeDto;
import cn.freemud.entities.dto.PushMessageTokenDto; import cn.freemud.entities.dto.PushMessageTokenDto;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,7 +24,6 @@ import org.springframework.test.context.junit4.SpringRunner; ...@@ -25,7 +24,6 @@ import org.springframework.test.context.junit4.SpringRunner;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目 * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment