Skip to content

O
order-group
Commit d0f86c00 by 李学兴
Options

Merge branch 'feature/20210720-购物车日志修改-张志恒' into qa 

# Conflicts:
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
parents 0378e4b9 5db14361
Showing with 440 additions and 323 deletions
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java
......@@ -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.DateTimeUtils;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
......
call-back-service/pom.xml
......@@ -61,7 +61,7 @@
<dependency>
<groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-orderdistributor-sdk</artifactId>
<version>3.5.7.RELEASE</version>
<version>3.5.8.RELEASE</version>
</dependency>
<dependency>
<groupId>com.freemud.sdk.api.assortment</groupId>
......
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
......@@ -29,7 +29,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
......@@ -43,11 +43,9 @@ import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistribution
import com.google.common.collect.Lists;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
......@@ -55,9 +53,6 @@ import java.util.*;
@Component
public class OrderCallBackMQService {
private static ApplicationContext context;
private static Logger logger = LoggerFactory.getLogger(OrderCallBackMQService.class);
@Autowired
private MQService mqService;
......@@ -71,8 +66,6 @@ public class OrderCallBackMQService {
private String invoicePartnerIds;
private static final String backOrdersChangeOrderStatusConsumerQueue="program.backorders_change_order_status_consumer_queue";
private static final String backOrdersNotifyActivityExchange="program.backorders_notify_activity_exchange";
@Autowired
private LogUtil logUtil;
public void sendOrderMQ(OrderCallBackRequestVo body) {
//发送订单回调
Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
......@@ -106,6 +99,7 @@ public class OrderCallBackMQService {
* @param body
*/
public void revert(OrderCallBackRequestVo body){
ApiLog.infoMessage("activityReverse start orderCode:{}", body.getOrderCode());
if (ObjectUtils.notEqual(body.getDelayMsgEventType(),2)){
return;
}
......@@ -118,8 +112,9 @@ public class OrderCallBackMQService {
Header header = new Header(MQAction.INSERT.getAction(), "backOrdersStatusChange", orderCode, backOrdersChangeOrderStatusConsumerQueue);
MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
ApiLog.infoMessage("activityReverse end orderCode:{}", body.getOrderCode());
} catch (Exception e) {
ErrorLog.errorConvertJson(this.getClass(),"activityReverseError:"+orderCode,e);
ApiLog.infoMessage("activityReverse Error orderCode:{} e:{}",e, body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
}
}
private void sendWechatReportMQ(OrderCallBackRequestVo body) {
......@@ -133,11 +128,10 @@ public class OrderCallBackMQService {
OrderCallBackConfig.QUEUE_ROUTING_KEY, OrderCallBackConfig.QUEUE_NAME);
MQMessage<WechatReportOrderDto> message = new MQMessage<>(header, wechatReportOrderDto);
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));
}
} catch (Exception ex) {
logUtil.error("sendWechatReportMQError OrderCode:{},OrderCallBackRequestVo:{}",ex,body.getOrderCode(),JSONObject.toJSONString(body));
ApiLog.infoMessage("sendWechatReportMQ end orderCode:{}", body.getOrderCode());
} catch (Exception e) {
ApiLog.infoMessage("sendWechatReportMQ Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
}
}
private DisRequest convent2DisRequest(OrderCallBackRequestVo orderBean, Integer orderState) {
......@@ -159,8 +153,8 @@ public class OrderCallBackMQService {
OrderInfoReqs orderInfoReqs = null;
try {
orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
} catch (Exception ex) {
logUtil.error(context.getEnvironment().getProperty("spring.application.name").concat("parseObjectOrderInfoReqsError,orderCode:{}"), ex,body.getOrderCode());
} catch (Exception e) {
ApiLog.infoMessage("getOrderInfoReqs parseObjectOrderInfoReqs Error,orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
return null;
}
// 未支付订单不通知开放平台
......@@ -187,8 +181,8 @@ public class OrderCallBackMQService {
(body.getOperateType() == 1 && NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())))) {
return orderInfoReqs;
}
} catch (Exception ex) {
ErrorLog.errorDev(context.getEnvironment().getProperty("spring.application.name").concat("parseObjectOrderInfoReqsError,orderCode:{}"), ex,body.getOrderCode());
} catch (Exception e) {
ApiLog.infoMessage("getWechatReportOrderInfoReqs parseObjectOrderInfoReqs Error,orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
return null;
}
return null;
......@@ -283,8 +277,7 @@ public class OrderCallBackMQService {
* @param body
*/
private void sendInvoiceReportMQ(OrderCallBackRequestVo body) {
logUtil.info("callback send invoice report MQ:{},{}",body.getOrderCode(), JSON.toJSONString(body));
ApiLog.infoMessage("callback sendInvoiceReportMQ start orderCode:{}",body.getOrderCode());
if (!ObjectUtils.equals("1", body.getMsgType()) || body.getOperateType() == null || body.getOperateType() == 2) {
return ;
}
......@@ -301,9 +294,9 @@ public class OrderCallBackMQService {
MQMessage<OrderInfoReqs> message = new MQMessage<>(header, orderInfoReqs);
mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
logUtil.info("callback send invoice mq orderCode={},mqRequest={}",body.getOrderCode(), JSON.toJSONString(orderInfoReqs));
ApiLog.infoMessage("callback sendInvoiceReportMQ end orderCode={}",body.getOrderCode());
} catch (Exception e) {
logUtil.error("callback set invoice mq orderCode={}",e,orderInfoReqs.getOrderCode());
ApiLog.infoMessage("callback sendInvoiceReportMQ Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
}
}
......@@ -313,7 +306,6 @@ public class OrderCallBackMQService {
*/
public void revertParkingOrders(OrderCallBackRequestVo body){
String orderCode=body.getOrderCode();
logUtil.info("parkingOrderBackOrdersStatusChange orderCode:{}", orderCode);
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(orderCode);
//2：未支付
......@@ -322,8 +314,9 @@ public class OrderCallBackMQService {
Header header = new Header(MQAction.INSERT.getAction(), "parkingOrderBackOrdersStatusChange", orderCode, backOrdersChangeOrderStatusConsumerQueue);
MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
ApiLog.infoMessage("revertParkingOrders parkingOrderBackOrdersStatusChange end orderCode:{}", orderCode);
} catch (Exception e) {
ErrorLog.errorConvertJson(this.getClass(),"parkingOrderBackOrdersStatusChange:"+orderCode,e);
ApiLog.infoMessage("revertParkingOrders parkingOrderBackOrdersStatusChange Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
}
}
......@@ -349,16 +342,17 @@ public class OrderCallBackMQService {
if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
return;
}
logUtil.info("send youshu report MQ orderCode:{} body:{} ", body.getOrderCode(), body);
ApiLog.infoMessage("send sendYoushuReportMQ start orderCode:{} ", body.getOrderCode());
// 正常变化 订单正向操作 fisherman 检查下
if (body.getOperateType() == 1 && "1".equals(body.getMsgType())) {
Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
OrderCallBackConfig.SEND_YOUSHU_REPORT_QUEUE_ROUTING_KEY, OrderCallBackConfig.SEND_YOUSHU_REPORT_QUEUE);
MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.SEND_YOUSHU_REPORT_QUEUE_ROUTING_KEY, message);
ApiLog.infoMessage("send sendYoushuReportMQ end orderCode:{}", body.getOrderCode());
}
}catch (Exception e){
logUtil.error("send youshu report MQ orderCode:{}", e,body.getOrderCode());
ApiLog.infoMessage("send sendYoushuReportMQ Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
}
}
......
call-back-service/src/main/java/cn/freemud/config/WebMvcConfig.java
......@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
......@@ -26,7 +25,6 @@ import java.util.List;
* WebMvcConfigurer
*/
@Configuration
//@Slf4j
public class WebMvcConfig implements WebMvcConfigurer {
@Bean
public ObjectMapper objectMapper(){
......
call-back-service/src/main/java/cn/freemud/controller/CallBackController.java
......@@ -34,7 +34,7 @@ public class CallBackController {
private OrderCallBackService orderCallBackService;
@PostMapping("/order")
@ApiAnnotation(logMessage = "/order")
@ApiAnnotation(logMessage = "/callback/order",printInfoLog = true)
public BaseResponse orderCallBackHandle(@Valid @RequestBody @LogParams OrderCallBackRequestVo requestVo) {
return orderCallBackService.orderCallBackHandle(requestVo);
}
......
call-back-service/src/test/java/cn.freemud/client/ActivityClientTest.java
......@@ -3,7 +3,6 @@
//import cn.freemud.base.constant.Version;
//import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
//import cn.freemud.service.thirdparty.ActivityClient;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
......
call-back-service/src/test/java/cn.freemud/manager/IappWxappConfigManagerTest.java
......@@ -13,7 +13,6 @@
//package cn.freemud.manager;
//
//import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
......
order-application-service/src/main/java/cn/freemud/annotations/LogIgnoreFeign.java
......@@ -16,7 +16,7 @@ public @interface LogIgnoreFeign {
* 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
* @return
*/
boolean printLog() default true;
boolean printLog() default false;
/**
* printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
......
order-application-service/src/main/java/cn/freemud/aop/LogIgnoreFeignAspect.java
......@@ -4,10 +4,11 @@ import cn.freemud.annotations.LogIgnore;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.vo.ThirdPartLogVo;
import cn.freemud.utils.AppLogUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.log.ThirdPartyLog;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Around;
......@@ -30,7 +31,6 @@ import java.lang.reflect.Method;
@Aspect
@Component
@Slf4j
public class LogIgnoreFeignAspect {
/**
* 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link LogIgnore}配置，输出响应报文里面所有的信息
......@@ -61,14 +61,17 @@ public class LogIgnoreFeignAspect {
Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
Object logReult = result;
ThirdPartLogVo thirdPartLogVo = AppLogUtil.createThirdPartLogVo(joinPoint);
// 打印第三方出参日志
if (!this.printFeignResponseBodyLog) {
LogIgnoreFeign logIgnore = currentMethod.getAnnotation(LogIgnoreFeign.class);
if (logIgnore != null && logIgnore.printLog()) {
String statusCodeValue = org.apache.commons.beanutils.BeanUtils.getProperty(result, logIgnore.statusCodeFieldName());
String messageValue = org.apache.commons.beanutils.BeanUtils.getProperty(result, logIgnore.messageFieldName());
String statusCodeValue = "ignore";
String messageValue = "ignore";
// 打印第三方出参日志 如果feign方法没有IgnoreFeignLogAnnotation注解,全部打日志,但是由于statusCodeValue = "ignore",是不是触发日志告警的
LogIgnoreFeign logIgnore = currentMethod.getAnnotation(LogIgnoreFeign.class);
if (logIgnore != null) {
JSONObject json = JSON.parseObject(JSON.toJSONString(result));
statusCodeValue = json.getString(logIgnore.statusCodeFieldName());
messageValue = json.getString(logIgnore.messageFieldName());
if (!this.printFeignResponseBodyLog && !logIgnore.printLog()) {
//todo 当排除了这个状态码不打印响应的具体内容只会打印状态码和状态描述信息
String[] excludeStatusCodes = logIgnore.excludeStatusCodes();
//当排除了这个状态码不打印响应的具体内容只会打印状态码和状态描述信息
if (!StringUtils.isEmpty(statusCodeValue) && this.containStatusCode(excludeStatusCodes, statusCodeValue)) {
logReult = result.getClass().newInstance();
org.apache.commons.beanutils.BeanUtils.setProperty(logReult, logIgnore.statusCodeFieldName(), statusCodeValue);
......@@ -76,7 +79,7 @@ public class LogIgnoreFeignAspect {
}
}
}
ThirdPartyLog.infoConvertJson(LogThreadLocal.getTrackingNo(), SDKCommonBaseContextWare.getAppName(), start, System.currentTimeMillis(),
ThirdPartyLog.infoConvertJson(statusCodeValue, messageValue, start, System.currentTimeMillis(),
thirdPartLogVo.getUri(), thirdPartLogVo.getRequestBody(), logReult);
}
} catch (Exception e) {
......
order-application-service/src/main/java/cn/freemud/config/WebMvcConfig.java
......@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
......@@ -28,7 +27,6 @@ import java.util.List;
* WebMvcConfigurer
*/
@Configuration
//@Slf4j
public class WebMvcConfig implements WebMvcConfigurer {
@Bean
public ObjectMapper objectMapper(){
......
order-application-service/src/main/java/cn/freemud/constant/ResponseCodeKeyConstant.java
......@@ -27,6 +27,8 @@ public class ResponseCodeKeyConstant {
public final static String STATUS_CODE = "statusCode";
public static final String STATUS_CODE_result= "result";
public static final String MEG = "meg";
public static final String MSG = "msg";
......
order-application-service/src/main/java/cn/freemud/controller/CallerController.java
......@@ -7,7 +7,6 @@ import cn.freemud.service.CallerService;
import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......
order-application-service/src/main/java/cn/freemud/controller/CollageOrderController.java
......@@ -5,12 +5,10 @@ import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.QueryOrderVo;
import cn.freemud.entities.vo.WechatGroupBuyVo;
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.LogParams;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
......
order-application-service/src/main/java/cn/freemud/controller/CreateOrderController.java
......@@ -6,7 +6,6 @@ import cn.freemud.entities.vo.SellCouponCreateOrderVo;
import cn.freemud.service.impl.SellCouponOrderServiceImpl;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
......
order-application-service/src/main/java/cn/freemud/controller/McCafeController.java
......@@ -9,7 +9,6 @@ import cn.freemud.service.OrderAdapterService;
import cn.freemud.service.Orderservice;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RequestMapping("/order")
@RestController
@Validated
......
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
......@@ -30,7 +30,6 @@ import cn.freemud.xxljob.OrderCountJobHandler;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
......@@ -39,7 +38,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.Map;
@Slf4j
@RequestMapping("/order")
@RestController
@Validated
......
order-application-service/src/main/java/cn/freemud/controller/OrderReportController.java
......@@ -6,7 +6,6 @@ import cn.freemud.entities.vo.OrderStateMonitorInfoVo;
import cn.freemud.service.Orderservice;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
* @Copyright: www.freemud.cn Inc.
*/
@Api(tags = "订单状态监控")
@Slf4j
@Validated
@RequestMapping("/order")
@RestController
......
order-application-service/src/main/java/cn/freemud/controller/ParkingOrderController.java
......@@ -5,7 +5,6 @@ import cn.freemud.entities.vo.parking.QueryParkingOrderVo;
import cn.freemud.service.ParkingOrderService;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
......
order-application-service/src/main/java/cn/freemud/controller/SpellGroupOrderController.java
......@@ -8,7 +8,6 @@ import cn.freemud.service.SpellGroupOrderService;
import com.freemud.application.sdk.api.log.ApiAnnotation;
import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
......
order-application-service/src/main/java/cn/freemud/hystrix/MemberClientFallbackFactory.java
......@@ -12,7 +12,6 @@
*/
package cn.freemud.hystrix;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Component
......
order-application-service/src/main/java/cn/freemud/interceptor/BizExceptionHandler.java
......@@ -5,7 +5,6 @@ import cn.freemud.base.entity.BaseResponse;
import cn.freemud.enums.ResponseResult;
import cn.freemud.inteceptor.CommonServiceException;
import cn.freemud.utils.ResponseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
......
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
......@@ -7,7 +7,6 @@ import cn.freemud.enums.OrderType;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule;
import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager;
import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
......@@ -25,7 +24,6 @@ import java.util.function.Function;
* @description: TODO
* @date 2021/5/31上午9:36
*/
@Slf4j
@Component
public class OrderTackCodeManager {
@Autowired
......
order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java
......@@ -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.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -40,7 +39,6 @@ import java.util.List;
* @date 2021/4/15下午3:45
*/
@Component
@Slf4j
public class SpellGroupOrderDataManager {
@Autowired
......
order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheckAdapter.java
......@@ -7,7 +7,6 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.utils.AppLogUtil;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.Objects;
......
order-application-service/src/main/java/cn/freemud/service/impl/BuriedPointServiceImpl.java
......@@ -7,8 +7,8 @@ import cn.freemud.entities.dto.*;
import cn.freemud.enums.GuessLikeStatus;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.BuriedPointService;
import cn.freemud.service.thirdparty.BuriedPointClient;
import cn.freemud.service.thirdparty.SyncTxProductClient;
//import cn.freemud.service.thirdparty.BuriedPointClient;
//import cn.freemud.service.thirdparty.SyncTxProductClient;
import cn.freemud.utils.AppLogUtil;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappConfig;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
......@@ -53,16 +53,16 @@ public class BuriedPointServiceImpl implements BuriedPointService {
private String signKey;
@Autowired
private SyncTxProductClient syncTxProductClient;
// @Autowired
// private SyncTxProductClient syncTxProductClient;
@Autowired
private RedisCache redisCache;
@Autowired
private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
@Autowired
private AssortmentOpenPlatformIappWxappConfigManager openPlatformIappWxappConfigManager;
@Autowired
private BuriedPointClient buriedPointClient;
// @Autowired
// private BuriedPointClient buriedPointClient;
@Override
public BaseResponse BuriedPointPayment(BuriedPointPaymentRequestDto requestDto, QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckMallOrder.java
......@@ -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.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......@@ -59,7 +58,6 @@ import java.util.Objects;
import java.util.stream.Collectors;
@Component
@Slf4j
public class CheckMallOrder {
@Autowired
......
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -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.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -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()))) {
return sendPaySuccessNoticeMessage();
}
// AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
return gson.toJson(message);
}
......@@ -693,7 +692,6 @@ public class MallOrderServiceImpl implements MallOrderService {
if (StringUtils.isEmpty(oid)) {
return;
}
// AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid);
requestDto.setOrderStatus(status);
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -543,7 +543,6 @@ public class OrderServiceImpl implements Orderservice {
if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) {
return sendPaySuccessNoticeMessage();
}
// AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
//orderRefund(orderBean, "订单异常退款", openid, oid);
return gson.toJson(message);
}
......@@ -2059,7 +2058,6 @@ public class OrderServiceImpl implements Orderservice {
}
// public void backOrdersNotifyActivity(OrderBean orderBean, List<Integer> transType) {
// LogUtil.info("backOrdersNotifyActivity", gson.toJson(orderBean), gson.toJson(transType));
// if (orderBean == null) {
// return;
// }
......@@ -2071,7 +2069,6 @@ public class OrderServiceImpl implements Orderservice {
// MQMessage<ActivityCancelStockRequestDto> message = new MQMessage<>(header, activityCancelStockRequestDto);
// mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
// } catch (Exception e) {
// LogUtil.error("ActivityReverse", JSON.toJSONString(activityCancelStockRequestDto), "", e);
// }
// }
......
order-application-service/src/main/java/cn/freemud/service/impl/ParkingOrderServiceImpl.java
......@@ -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.response.PaymentQueryOrderResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
order-application-service/src/main/java/cn/freemud/service/impl/UserServiceImpl.java
......@@ -9,7 +9,6 @@
//import cn.freemud.redis.RedisCache;
//import cn.freemud.service.UserService;
//import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
......
order-application-service/src/main/java/cn/freemud/service/impl/WechatOrderPushDistributeMQServiceImpl.java
......@@ -3,7 +3,6 @@
//import cn.freemud.service.OrderDistributeMQService;
//import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
//import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
......
order-application-service/src/main/java/cn/freemud/service/process/ActivityProcessor.java
//package cn.freemud.service.process;
//
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Component;
//
///**
......
order-application-service/src/main/java/cn/freemud/service/process/AnnotationFactory.java
......@@ -3,7 +3,6 @@
//import cn.freemud.annotations.ActivityImpl;
//import cn.freemud.enums.ActivityImplEnum;
//import com.google.common.base.Throwables;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.BeansException;
//import org.springframework.context.ApplicationContext;
//import org.springframework.context.ApplicationContextAware;
......@@ -16,7 +15,6 @@
// * 描述类的作用
// * Created by:zhangbiao
// */
//@Slf4j
//@Component
//public class AnnotationFactory implements ApplicationContextAware {
//
......
order-application-service/src/main/java/cn/freemud/service/process/WechatPush/WechatPushProcessor.java
......@@ -90,14 +90,12 @@
// baseQueryOrderRequest.setOrderId(oId);
// QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
// if (null == userLoginInfoDto || null == queryOrderByIdResponse || null == queryOrderByIdResponse.getData()) {
// LogUtil.error("syncStatusOrderCreate 订单上送信息不全 终止上送", gson.toJson(userLoginInfoDto) + gson.toJson(queryOrderByIdResponse) + gson.toJson(queryOrderByIdResponse.getData()), "");
// return false;
// }
// QueryOrdersResponse.DataBean.OrderBean orderBean = queryOrderByIdResponse.getData();
// // 获取当前商户微信支付mchId
// AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppId());
// if (wxApp == null || wxApp.getMchId() == null) {
// LogUtil.error("syncStatusOrderCreate 订单上送信息 未查询到商户号", gson.toJson(wxApp), "");
// return false;
// }
//
......@@ -107,14 +105,8 @@
//
// //MQ消息发送
// 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);
// } catch (Exception e) {
// LogUtil.error("syncStatusOrderCreate 微信上送,发送MQ异常", gson.toJson(disRequest), "", e);
// }
// return true;
// }
......@@ -133,7 +125,6 @@
// try {
// AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
// if (null == userLoginInfoDto) {
// LogUtil.error("syncStatusOrderPay 订单上送信息不全 终止上送", gson.toJson(userLoginInfoDto), "");
// return;
// }
// // 兼容老支付逻辑
......@@ -142,7 +133,6 @@
// // 获取当前商户微信支付mchId
// AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppId());
// if (wxApp == null || wxApp.getMchId() == null) {
// LogUtil.error("syncStatusOrderCreate 订单上送信息 未查询到商户号", gson.toJson(wxApp), "");
// return;
// }
// mchId = wxApp.getMchId();
......@@ -156,7 +146,6 @@
// DisRequest disRequest = convent2DisRequest(orderBody);
// orderDistributeMQService.messageDistribute(disRequest);
// } catch (Exception e) {
// LogUtil.info("syncStatusOrderCreate 微信上送异常", "", "", e);
// }
//
//
......@@ -228,13 +217,11 @@
// 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());
// if (CollectionUtils.isEmpty(pluginVoList) || pluginVoList.size() != 1) {
// LogUtil.error("checkWechatOpenPlugin 订单上送信息 未开启优惠插件", gson.toJson(pluginVoList), "");
// return true;
// }
// WxappPluginVo wxappPluginVo = pluginVoList.get(0);
//
// if (!Objects.equals(wxappPluginVo.getAuditStatus(), PluginAuditStatusEnum.PASS.getCode()) || !Objects.equals(wxappPluginVo.getOperateStatus(), YesOrNoEnum.YES.getCode())) {
// LogUtil.error("checkWechatOpenPlugin 订单上送信息 未开启优惠插件", gson.toJson(wxappPluginVo), "");
// return true;
// }
// return false;
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
......@@ -12,6 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.activity.ActivityRequestCommon;
import cn.freemud.entities.dto.activity.CheckAndJoinResponse;
......@@ -31,6 +32,7 @@ public interface ActivityApplicationClient {
/**
* 付有礼活动验证与参与
*/
@LogIgnoreFeign
@PostMapping("/promotionActivity/payGiftCheckAndJoin")
public BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftCheckAndJoin(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
......@@ -40,6 +42,7 @@ public interface ActivityApplicationClient {
* @param requestVo
* @return
*/
@LogIgnoreFeign
@PostMapping("/promotionActivity/payGiftShareCheckAndJoin")
BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
......@@ -47,6 +50,7 @@ public interface ActivityApplicationClient {
* 查询可领券活动
* 目前: 评价有礼活动使用
*/
@LogIgnoreFeign
@PostMapping("/promotionActivity/evaluate/checkAndJoin")
public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/CardBinClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto;
import cn.freemud.entities.dto.GetAppKeyRequestDto;
......@@ -20,6 +22,7 @@ public interface CardBinClient {
* @param requestDto
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/getAppKey")
GetAppKeyResponseDto getAppKey(GetAppKeyRequestDto requestDto);
......@@ -28,6 +31,7 @@ public interface CardBinClient {
* @param requestDto
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping(value = "/batchQueryActivityInfo")
BatchQueryActivityInfoResponseDto batchQueryActivityInfo(BatchQueryActivityInfoRequestDto requestDto);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/ComPayClient.java
......@@ -13,6 +13,8 @@
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.pay.CombPayResponse;
import cn.freemud.entities.dto.pay.MultiQueryRequest;
import cn.freemud.entities.dto.pay.MultiQueryRespDto;
......@@ -31,12 +33,14 @@ public interface ComPayClient {
/**
* 混合支付统一下单
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG)
@PostMapping("/payment/application/pay")
CombPayResponse combPay(@RequestBody CombPayRequest combPayRequest, @RequestHeader("partnerId") String partnerId);
/**
* 混合支付查询接口
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG)
@PostMapping("/payment/application/query")
MultiQueryRespDto<MultiQueryRespDto.Data> paymentApplicationQuery(MultiQueryRequest multiQueryRequest, @RequestHeader("partnerId") Integer partnerId);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponAdapterClient.java
......@@ -12,6 +12,8 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.coupon.CouponAvailableReqVo;
import cn.freemud.entities.coupon.CouponAvailableRespDto;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -29,6 +31,7 @@ public interface CouponAdapterClient {
* @param couponAvailableReqVo
* @return
*/
@LogIgnoreFeign(statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE_result)
@PostMapping("/getCouponsAvailable")
CouponAvailableRespDto getCouponsAvailable(CouponAvailableReqVo couponAvailableReqVo);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOfflineClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.CouponCodeResponseDto;
import cn.freemud.entities.dto.CouponCodeVerificationDto;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -8,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
@FeignClient(name = "OPEN-STORE-OFFLINE-COUPON-SERVICE",url="${saas.couponofflineclient.feign.url}")
public interface CouponOfflineClient {
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/api")
CouponCodeResponseDto verification(CouponCodeVerificationDto couponCodeVerificationDto);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java
......@@ -2,6 +2,8 @@ package cn.freemud.service.thirdparty;
//import cn.freemud.constant.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.GetCouponDetailResponseDto;
import cn.freemud.entities.dto.coupon.InvalidCouponsRequestDto;
import cn.freemud.entities.dto.coupon.InvalidCouponsResponseDto;
......@@ -27,11 +29,13 @@ public interface CouponOnlineClient {
@PostMapping(value = "/code_v4", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,
consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE}
)
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
GetCouponDetailResponseDto getCouponDetails(@RequestParam Map<String, ?> map);
/**
* 查询券详情
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping(value = "/coupon/state/invalid/coupons")
InvalidCouponsResponseDto invalidCoupons(@RequestBody InvalidCouponsRequestDto invalidCouponsRequestDto);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.GetUserScoreUserDetailDto;
import cn.freemud.entities.vo.GetUserScoreUseDetailVo;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -28,6 +29,7 @@ public interface CustomScoreClient {
/**
* 用户可用积分
*/
@LogIgnoreFeign
@PostMapping(value = "/user/scoreUseDetail")
GetUserScoreUserDetailDto getUserScoreUseDetail(@RequestBody GetUserScoreUseDetailVo getUserScoreUseDetailVo);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.PurchasePaidRequestDto;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -23,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
public interface CustomerApplicationClient {
// TODO: 21-4-1 带合并
@LogIgnoreFeign
@PostMapping(value = "membercard/purchasePaid")
BaseResponse purchasePaid(PurchasePaidRequestDto requestDto);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java
......@@ -13,6 +13,7 @@
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.*;
import com.freemud.application.sdk.api.base.BaseResponse;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -93,6 +94,7 @@ public interface CustomerClient {
/**
* 查询收货地址详情
*/
@LogIgnoreFeign
@PostMapping(value = "/customerservice/extend/getMemberExtendInfo")
BaseResponse<GetMemberExtendInfoResponseDto>
getMemberExtendInfo(@RequestBody GetMemberExtendInfoRequestDto extendInfoRequest);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java
......@@ -13,6 +13,7 @@
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
import cn.freemud.entities.dto.user.*;
......@@ -27,12 +28,15 @@ public interface CustomerExtendClient {
/**
* 会员优惠券列表
*/
@LogIgnoreFeign
@PostMapping(value = "/customerextendservice/coupon/getCoupons")
GetMemberCouponListResponseDto getMemberCouponListRequestDto(@RequestBody GetMemberCouponListRequestDto getMemberCouponListRequestDto);
@LogIgnoreFeign
@PostMapping(value = "/customerextendservice/qujia/receiveCard")
SendCouponForqujiaDtoResponseDto sendCouponForqujia(@RequestBody SendCouponForqujiaRequestDto request);
@LogIgnoreFeign
@PostMapping(value = "/customerextendservice/qujia/b2breceiveCard")
B2bReceiveCardResponseDto b2bReceiveCard(@RequestBody B2bReceiveCardRequestDto request);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/EcologyAdminApplicationClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.ecology.*;
import cn.freemud.entities.dto.wechat.GetAuthorizerRequestDto;
......@@ -21,16 +22,19 @@ public interface EcologyAdminApplicationClient {
/**
* 获取虚拟门店
*/
@LogIgnoreFeign
@PostMapping(value = "ecology/api/app/info/getBuyBindVirtualStore", produces = MediaType.APPLICATION_JSON_VALUE ,consumes = MediaType.APPLICATION_JSON_VALUE )
BaseResponse<VirtualBindStoreResponse> getBuyBindVirtualStore(@RequestBody VirtualStoreRequest virtualStoreRequest);
@LogIgnoreFeign
@PostMapping(value = "/ecology/api/getAuthorizerAccessToken")
GetTokenResponseDto getAuthorizerAccessToken(@RequestBody GetAuthorizerRequestDto request);
@LogIgnoreFeign
@PostMapping(value = "/ecology/api/subscribeMessage/send")
SubscribeMessageResponse subscribeMessage(SubscribeMessageRequest request);
@LogIgnoreFeign
@PostMapping(value = "/ecology/api/templateMessage/send")
SendMessageResponse sendTemplateMessage(SendMessageRequest request);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/FMAssistantCloudPrintClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.GetStoreCloudPrintDto;
import cn.freemud.entities.dto.GetStoreCloudPrintResponseDto;
......@@ -16,6 +17,7 @@ public interface FMAssistantCloudPrintClient {
/**
* 申请退款小票打印
*/
@LogIgnoreFeign
@PostMapping(value = "/assistant/cloudPrint/applyRefund/print")
BaseResponse applyRefundPrint(@RequestBody OrderPrintDto orderPrintDto);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/MicroOpenplatformClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.delivery.GetFilterPartnerResponse;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.vo.SendOrderCountsMsg;
......@@ -29,6 +30,7 @@ public interface MicroOpenplatformClient {
* @param orderCounts
* @return
*/
@LogIgnoreFeign
@PostMapping("/thirdApp/order/addOrderSum")
BaseResponse addOrderSum(@RequestBody SendOrderCountsMsg orderCounts);
......@@ -38,6 +40,7 @@ public interface MicroOpenplatformClient {
*
* @return
*/
@LogIgnoreFeign
@PostMapping("/thirdApp/getFilterPartner")
BaseResponse<GetFilterPartnerResponse> getFilterPartner(@RequestBody OrderGetPartnerRequest request);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.order.FacePayRequestDto;
import cn.freemud.entities.dto.order.FacePayResponseDto;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -28,6 +29,7 @@ public interface PaymentNewClient {
/**
* 扫脸支付
*/
@LogIgnoreFeign
@PostMapping("paymentcenter/facePay")
com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/PosClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.pos.PosBaseRequestDto;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -27,18 +28,21 @@ public interface PosClient {
/**
* 配送
*/
@LogIgnoreFeign
@PostMapping("/order/order/Send")
BaseResponse posSend(@RequestBody PosBaseRequestDto requestDto);
/**
* 完成
*/
@LogIgnoreFeign
@PostMapping("/order/order/Affirm")
BaseResponse posAffirm(@RequestBody PosBaseRequestDto requestDto);
/**
* 骑手接单推送POS服务
*/
@LogIgnoreFeign
@PostMapping("/order/delivery/riderStatus")
BaseResponse deliveryRiderStatus(@RequestBody PosBaseRequestDto request);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionActivityClient.java
......@@ -12,6 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.*;
import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
......@@ -22,83 +23,86 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface PromotionActivityClient {
/**
* 查询门店可参与的活动列表
*/
@PostMapping("/activities/getActivitiesByStoreId")
GetActivitiesResponseDto getActivitiesByStoreId(@RequestBody GetActivitiesDto getActivitiesDto);
/**
* 查询最近的一次进店有礼活动以及进店有礼领取验证
* @param getActivitiesDto
* @return
*/
@PostMapping("/activities/enterGift/getActivitiesAndCheck")
EnterGiftCheckResponseDto getActivitiesAndCheck(@RequestBody GetActivitiesDto getActivitiesDto);
/**
* 获取活动后的价格
*/
@PostMapping("/activities/fullSubtraction/getPrice")
BaseResponse getPromotionPrice(@RequestBody GetPromotionPriceDto getPromotionPriceDto);
// /**
// * 查询门店可参与的活动列表
// */
// @PostMapping("/activities/getActivitiesByStoreId")
// GetActivitiesResponseDto getActivitiesByStoreId(@RequestBody GetActivitiesDto getActivitiesDto);
//
// /**
// * 查询最近的一次进店有礼活动以及进店有礼领取验证
// * @param getActivitiesDto
// * @return
// */
// @PostMapping("/activities/enterGift/getActivitiesAndCheck")
// EnterGiftCheckResponseDto getActivitiesAndCheck(@RequestBody GetActivitiesDto getActivitiesDto);
//
// /**
// * 获取活动后的价格
// */
// @PostMapping("/activities/fullSubtraction/getPrice")
// BaseResponse getPromotionPrice(@RequestBody GetPromotionPriceDto getPromotionPriceDto);
/**
* 增加分享裂变活动的分享记录
*/
@LogIgnoreFeign
@PostMapping("/activities/share/record")
BaseResponse shareRecord(@RequestBody ShareAcitivityRequestDto createActivityRecordDto);
/**
* 增加参与活动记录
*/
@PostMapping("/activities/addRecord")
BaseResponse addRecord(@RequestBody CreateActivityRecordDto createActivityRecordDto);
/**
* 校验用户是否可以参与活动
*/
@PostMapping("/activities/check")
BaseResponse checkActivityValid(@RequestBody CheckActivityVaildDto checkActivityVaildDto);
/**
* 领券验证接口
*/
@PostMapping("/activities/share/canReceive")
BaseResponse canReceive(@RequestBody CanRecriveRequestDto checkActivityVaildDto);
// /**
// * 增加参与活动记录
// */
// @PostMapping("/activities/addRecord")
// BaseResponse addRecord(@RequestBody CreateActivityRecordDto createActivityRecordDto);
//
// /**
// * 校验用户是否可以参与活动
// */
// @PostMapping("/activities/check")
// BaseResponse checkActivityValid(@RequestBody CheckActivityVaildDto checkActivityVaildDto);
//
// /**
// * 领券验证接口
// */
// @PostMapping("/activities/share/canReceive")
// BaseResponse canReceive(@RequestBody CanRecriveRequestDto checkActivityVaildDto);
/**
* 根据活动ID查询活动信息
*/
@LogIgnoreFeign
@GetMapping("/activities/share/getActivity")
ActivityGetByIdResponseDto getById(@RequestParam("activityId") Long activityId);
/**
* 查询分享页面领取的记录
*/
@PostMapping("/activities/share/shareReceiveRecordList")
ShareReceiveRecordlistResponseDto shareReceiveRecordList(ShareReceiveRecordListDto shareReceiveRecordListDto);
/**
* 进店有礼验证接口
*/
@PostMapping("/activities/enterGift/check")
EnterGiftCheckResponseDto enterGiftCheck(EnterGiftCheckDto enterGiftCheckDto);
/**
* 根据订单ID查询历史分享记录
*/
@PostMapping("/activities/share/queryShareByOrderId")
BaseResponse queryShareByOrderId(QueryShareByOrderIdDto queryShareByOrderIdDto);
/**
* 增加参与活动记录
*/
@PostMapping("/activities/enterGift/entershopRecord")
BaseResponse entershopRecord(@RequestBody EntershopRecordDto entershopRecordDto);
// /**
// * 查询分享页面领取的记录
// */
// @PostMapping("/activities/share/shareReceiveRecordList")
// ShareReceiveRecordlistResponseDto shareReceiveRecordList(ShareReceiveRecordListDto shareReceiveRecordListDto);
//
// /**
// * 进店有礼验证接口
// */
// @PostMapping("/activities/enterGift/check")
// EnterGiftCheckResponseDto enterGiftCheck(EnterGiftCheckDto enterGiftCheckDto);
//
// /**
// * 根据订单ID查询历史分享记录
// */
// @PostMapping("/activities/share/queryShareByOrderId")
// BaseResponse queryShareByOrderId(QueryShareByOrderIdDto queryShareByOrderIdDto);
//
// /**
// * 增加参与活动记录
// */
// @PostMapping("/activities/enterGift/entershopRecord")
// BaseResponse entershopRecord(@RequestBody EntershopRecordDto entershopRecordDto);
/**
* 获取活动id
*/
@LogIgnoreFeign
@PostMapping("/activities/share/queryValidShareActivity")
BaseResponse queryValidShareActivity(@RequestBody QueryValidShareActivityReq activityReq);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java
......@@ -12,6 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
......@@ -39,18 +40,21 @@ public interface PromotionDiscountClient {
* @param calculationDiscountRequestDto
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/calculation/discount/sharing")
ActivityCalculationDiscountResponseDto calculationDiscountSharing(CalculationDiscountRequestDto calculationDiscountRequestDto);
/**
* 统一活动查询接口
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/activity/query")
ActivityQueryResponseDto query(ActivityQueryRequestDto activityQueryRequestDto);
/**
* 优惠金额计算
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/calculation/discount")
CalculationDiscountResponseDto calculationDiscount(CalculationDiscountRequestDto calculationDiscountRequestDto);
......@@ -60,6 +64,7 @@ public interface PromotionDiscountClient {
* @param groupWorkQueryRequest
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/groupWork/query")
GroupWorkQueryResponse groupWorkQuery(GroupWorkQueryRequest groupWorkQueryRequest);
......@@ -69,6 +74,7 @@ public interface PromotionDiscountClient {
* @param groupWorkJoinRequest
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/activity/groupWork/join")
GroupWorkJoinResponse groupWorkJoin(GroupWorkJoinRequest groupWorkJoinRequest);
......@@ -77,6 +83,7 @@ public interface PromotionDiscountClient {
* @param querySpellGroupRequest
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/activity/groupWork/queryByGroupId")
QuerySpellGroupVoResponse queryByGroupId(QuerySpellGroupRequest querySpellGroupRequest);
......@@ -85,6 +92,7 @@ public interface PromotionDiscountClient {
* @param querySpellGroupRequest
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/activity/groupWork/queryHistory")
QueryHistoryGroupVOResponse queryHistory(QueryGroupHistoryRequest querySpellGroupRequest);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/ShoppingCartClient.java
......@@ -12,6 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.shoppingCart.GetShoppingCartGoodsApportionDto;
......@@ -32,6 +33,7 @@ public interface ShoppingCartClient {
* @param request
* @return
*/
@LogIgnoreFeign
@PostMapping(value = "/add?lang=zh_CN")
ShoppingCartInfoDto addShoppingCart(@RequestBody AddShoppingCartRequestDto request);
......@@ -40,6 +42,7 @@ public interface ShoppingCartClient {
* @param request
* @return
*/
@LogIgnoreFeign
@PostMapping(value = "/updateCartInfo?lang=zh_CN")
ShoppingCartBaseResponse updateShoppingCart(@RequestBody UpdateShoppingCartRequestDto request);
......@@ -48,6 +51,7 @@ public interface ShoppingCartClient {
* @param request
* @return
*/
@LogIgnoreFeign
@PostMapping(value = "/detail?lang=zh_CN")
ShoppingCartInfoDto getShoppingCart(@RequestBody GetShoppingCartDto request);
......@@ -57,6 +61,7 @@ public interface ShoppingCartClient {
* @param request
* @return
*/
@LogIgnoreFeign
@PostMapping(value = "/clearCartGoods?lang=zh_CN")
ShoppingCartBaseResponse clearShoppingCart(@RequestBody NewShoppingCartClearDto request);
......@@ -66,6 +71,7 @@ public interface ShoppingCartClient {
* @param request
* @return
*/
@LogIgnoreFeign
@PostMapping(value = "/MCoffee/clearCartGoods?lang=zh_CN")
ShoppingCartBaseResponse clearMCCafeShoppingCart(@RequestBody NewShoppingCartClearDto request);
......@@ -74,42 +80,49 @@ public interface ShoppingCartClient {
* @param request
* @return
*/
@LogIgnoreFeign
@PostMapping(value = "/remove?lang=zh_CN")
ShoppingCartBaseResponse removeProduct(@RequestBody RemoveShoppingCartRequestDto request);
/**
* 获取购物车详情，包含均摊信息
*/
@LogIgnoreFeign
@PostMapping(value = "/getShoppingCartGoodsApportion?lang=zh_CN")
BaseResponse<ShoppingCartGoodsDto> getShoppingCartGoodsApportionNew(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
/**
* 麦咖啡获取购物车详情，包含均摊信息
*/
@LogIgnoreFeign
@PostMapping(value = "/MCoffee/getShoppingCartGoodsApportion?lang=zh_CN")
BaseResponse<ShoppingCartGoodsDto> getMCCafeShoppingCartGoodsApportionNew(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
/**
* 获取拼单订单购物车详情，包含均摊信息
*/
@LogIgnoreFeign
@PostMapping(value = "/collage/getShoppingCartGoodsApportion?lang=zh_CN")
BaseResponse<ShoppingCartGoodsDto> getCollageShoppingCartGoodsApportion(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
/**
* 清空拼单购物车
*/
@LogIgnoreFeign
@PostMapping(value = "/collage/clearOrder?lang=zh_CN")
BaseResponse clearCollageOrder(@RequestBody NewShoppingCartClearDto newShoppingCartClearDto);
/**
* 更新拼单信息
*/
@LogIgnoreFeign
@PostMapping(value = "/collage/updateOrder?lang=zh_CN")
BaseResponse updateCollageOrder(@RequestBody CollageOrderDto collageOrderDto);
/**
* 获取拼单状态信息
*/
@LogIgnoreFeign
@PostMapping(value = "/collage/getOrderStatus?lang=zh_CN")
BaseResponse<Integer> getCollageOrderStatus(@RequestBody CollageOrderDto collageOrderDto);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreBackstageClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.openplatform.PushOrderStoreDto;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public interface StoreBackstageClient {
@LogIgnoreFeign
@PostMapping("/orderStore/pushOrderStore")
BaseResponse pushOrderStore(@RequestBody PushOrderStoreDto request);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreBaseApiClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.store.StoreCBaseResponse;
import cn.freemud.entities.dto.store.StoreCBaseResponseDto;
import cn.freemud.entities.dto.store.StoreInfoRequestDto;
......@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = "/store", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public interface StoreBaseApiClient {
@LogIgnoreFeign
@PostMapping(value = "/delivery/calcDeliveryData")
StoreCBaseResponse<StoreCBaseResponseDto> queryDeliverDetail(@RequestBody StoreInfoRequestDto request);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreItemClient.java
......@@ -12,6 +12,8 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.ShopBaseResponseDto;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.product.GetValidateProductInfoDto;
......@@ -32,18 +34,21 @@ public interface StoreItemClient {
* 获取门店特定时间段菜单分类
*/
@PostMapping(value = "/Menu/GetMenu")
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
GetMenuResponseDto getMenuCategory(@RequestBody GetMenuCategoryInfoDto getMenuCategoryInfoDto);
/**
* 根据spu或单品ID查询菜单
* 根据商品id查询门店特定时间段菜单
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
@PostMapping(value = "/Menu/GetMenuByIds")
GetMenuByIdsResponseDto getMenuCategoryByIds(@RequestBody GetMenuCategoryByIdsDto getMenuCategoryByIdsDto);
/**
* 获取商品的详细信息
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
@PostMapping("/Shop/ListProductInfoByIdList")
ProductInfosDto listProductInfos(@RequestBody GetProductInfoDto getProductInfoDto);
......@@ -53,6 +58,7 @@ public interface StoreItemClient {
* 根据skuid查询spu信息
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
@PostMapping("/Product/GetSpectionProductBySkuId")
ProductListDto getSpuIdsBySkuIds(@RequestBody GetSpuIdsBySkuIdsDto requestDto);
......@@ -62,6 +68,7 @@ public interface StoreItemClient {
* @param request
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
@PostMapping(value = "/Shop/ListDishwareProduct", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
ShopBaseResponseDto<List<ProductListDto.DataBean>> findDishWareProductList(@RequestBody GetShopDishWareProductDto request);
......@@ -69,6 +76,7 @@ public interface StoreItemClient {
/**
* 校验商品在当前门店是否可售
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
@PostMapping("/Shop/validateShopContainProduct")
ValidateProductInfosDto validateShopContainProduct(@RequestBody GetValidateProductInfoDto getProductInfoDto);
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/SvcComPayClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.dto.SvcComPayRequestDto;
import cn.freemud.entities.dto.SvcComPayResponseDto;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface SvcComPayClient {
@LogIgnoreFeign
@PostMapping("/paymentmanager/partnerSetting/queryAssociationPaymentFlagPartnerSetting")
SvcComPayResponseDto query(SvcComPayRequestDto svcComPayRequestDto);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/SyncTxProductClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.entities.dto.BuriedPointRequestDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: RecommendClient
* @Package cn.freemud.service.thirdparty
* @Description: 简单描述下这个类是做什么用的
* @author: zhenghuan.yang
* @date: 2018/9/25 20:29
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
//测试：http://115.159.187.179:8484 生产：10.10.3.79:8002
@FeignClient(value = "SYNCTXPRODUCTSERVICE",url="${saas.synctxproductclient.feign.url}")
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface SyncTxProductClient {
/**
* 行为上传接口
*/
@PostMapping(value = "/collector/v1/buryPoint/")
String BuriedPoint(@RequestBody BuriedPointRequestDto BuriedPointRequestDto);
}
//package cn.freemud.service.thirdparty;
//import cn.freemud.entities.dto.BuriedPointRequestDto;
//import org.springframework.cloud.openfeign.FeignClient;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @version V1.0
// * @Title: RecommendClient
// * @Package cn.freemud.service.thirdparty
// * @Description: 简单描述下这个类是做什么用的
// * @author: zhenghuan.yang
// * @date: 2018/9/25 20:29
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
////测试：http://115.159.187.179:8484 生产：10.10.3.79:8002
//@FeignClient(value = "SYNCTXPRODUCTSERVICE",url="${saas.synctxproductclient.feign.url}")
//@RequestMapping(produces = {"application/json;charset=UTF-8"})
//public interface SyncTxProductClient {
// /**
// * 行为上传接口
// */
// @PostMapping(value = "/collector/v1/buryPoint/")
// String BuriedPoint(@RequestBody BuriedPointRequestDto BuriedPointRequestDto);
//
//}
order-application-service/src/main/java/cn/freemud/service/thirdparty/WeChatClient.java
......@@ -12,6 +12,8 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.GetWxQrcodeDto;
import cn.freemud.entities.dto.WeChatGetAccessTokenResponseDto;
import cn.freemud.entities.dto.WechatSendMessageDto;
......@@ -24,48 +26,48 @@ import org.springframework.web.bind.annotation.*;
@FeignClient(name = "WECHAT-SERVICE", url = "${saas.wechatclient.feign.url}")
public interface WeChatClient {
/**
* 小程序登录 获取用户openId 和 sercetKey
*
* @param appid 小程序appId
* @param secret 小程序appSecret
* @param jsCode code
* @param grantType authorization_code
* @return
*/
@GetMapping(value = "/sns/jscode2session",produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
String getSession(@RequestParam("appid") String appid, @RequestParam("secret") String secret,
@RequestParam("js_code") String jsCode, @RequestParam("grant_type") String grantType);
/**
* 小程序登录 获取用户openId 和 sercetKey 小程序授权模式
*/
@GetMapping(value = "/sns/component/jscode2session", produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
String getCode2session(@RequestParam("appid") String appid, @RequestParam("js_code") String code,
@RequestParam("grant_type") String authorizationCode, @RequestParam("component_appid") String componentAppid,
@RequestParam("component_access_token") String componentAccessToken);
/**
* 获取小程序access_token
*/
@GetMapping(value = "/cgi-bin/token", produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
WeChatGetAccessTokenResponseDto getAccessToken(@RequestParam("grant_type") String grantType, @RequestParam("appid") String appid,
@RequestParam("secret") String secret);
/**
* 获取小程序码
*/
@PostMapping(value = "wxa/getwxacodeunlimit?access_token=12_-kLukRhVUNHrX2JFwSTHK7ZjAkSAKRQuReFhmoZKGywkUbBNTWoR8IDHbfN0jA1ot_i2xlhkV89tKUqM8hDBsAMPlg6d6p0YnqufZY5B-pFzG_JH7rbb43Lcc3gnNAvHQLrD-rpRg3LGi5VDYERgAFADJW",
produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
String getWxacodeunlimit(@RequestBody GetWxQrcodeDto getWxQrcodeDto);
@PostMapping(value = "/cgi-bin/message/wxopen/template/send?access_token={accessToken}", produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
String sendMessageNotice(@PathVariable("accessToken") String accessToken, @RequestBody WechatSendMessageDto wechatSendMessageDto);
// /**
// * 小程序登录 获取用户openId 和 sercetKey
// *
// * @param appid 小程序appId
// * @param secret 小程序appSecret
// * @param jsCode code
// * @param grantType authorization_code
// * @return
// */
// @GetMapping(value = "/sns/jscode2session",produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// String getSession(@RequestParam("appid") String appid, @RequestParam("secret") String secret,
// @RequestParam("js_code") String jsCode, @RequestParam("grant_type") String grantType);
//
//
// /**
// * 小程序登录 获取用户openId 和 sercetKey 小程序授权模式
// */
// @GetMapping(value = "/sns/component/jscode2session", produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// String getCode2session(@RequestParam("appid") String appid, @RequestParam("js_code") String code,
// @RequestParam("grant_type") String authorizationCode, @RequestParam("component_appid") String componentAppid,
// @RequestParam("component_access_token") String componentAccessToken);
//
//
// /**
// * 获取小程序access_token
// */
// @GetMapping(value = "/cgi-bin/token", produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// WeChatGetAccessTokenResponseDto getAccessToken(@RequestParam("grant_type") String grantType, @RequestParam("appid") String appid,
// @RequestParam("secret") String secret);
//
//
// /**
// * 获取小程序码
// */
// @PostMapping(value = "wxa/getwxacodeunlimit?access_token=12_-kLukRhVUNHrX2JFwSTHK7ZjAkSAKRQuReFhmoZKGywkUbBNTWoR8IDHbfN0jA1ot_i2xlhkV89tKUqM8hDBsAMPlg6d6p0YnqufZY5B-pFzG_JH7rbb43Lcc3gnNAvHQLrD-rpRg3LGi5VDYERgAFADJW",
// produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// String getWxacodeunlimit(@RequestBody GetWxQrcodeDto getWxQrcodeDto);
//
// @PostMapping(value = "/cgi-bin/message/wxopen/template/send?access_token={accessToken}", produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
// consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// String sendMessageNotice(@PathVariable("accessToken") String accessToken, @RequestBody WechatSendMessageDto wechatSendMessageDto);
//
......@@ -75,6 +77,7 @@ public interface WeChatClient {
@PostMapping(value = "wxa/business/groupBuy/createOrder?access_token={accessToken}",
produces = MediaType.APPLICATION_JSON_VALUE,
consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
GroupBuyResponse groupBuyCreateOrder(@PathVariable("accessToken") String accessToken, @RequestBody GroupBuyRequest groupBuyRequest);
}
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
......@@ -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.service.StandardPaymentService;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......@@ -113,7 +112,6 @@ import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.R
* @date 2018/05/08
*/
@Service
@Slf4j
public abstract class UniversalOrderService {
@Autowired
......
order-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java
......@@ -7,10 +7,8 @@ import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.AppLogUtil;
import com.alibaba.fastjson.JSON;
//import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.application.sdk.api.util.SignUtil;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,7 +22,6 @@ import java.util.Arrays;
import java.util.Map;
import java.util.TreeMap;
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
......
order-application-service/src/test/java/cn.freemud/client/CouponClientTest.java
......@@ -6,7 +6,6 @@
//import cn.freemud.service.thirdparty.CouponClient;
//import cn.freemud.service.thirdparty.CouponOfflineClient;
//import com.alibaba.fastjson.JSON;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
......@@ -19,9 +18,7 @@
//import java.util.*;
//import java.util.function.Predicate;
//import java.util.stream.Collectors;
//
//@Slf4j
//@RunWith(SpringRunner.class)
////@RunWith(SpringRunner.class)
//@SpringBootTest
//@EnableDiscoveryClient
//@EnableFeignClients
......
order-application-service/src/test/java/cn.freemud/client/CustomerExtendClientTest.java
......@@ -3,7 +3,6 @@ package cn.freemud.client;
import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
import cn.freemud.service.thirdparty.CustomerExtendClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -15,7 +14,6 @@ import org.springframework.test.context.junit4.SpringRunner;
import java.util.ArrayList;
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
......
order-application-service/src/test/java/cn.freemud/client/EcologyAdminApplicationClientTest.java
......@@ -7,7 +7,6 @@ import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
import cn.freemud.service.thirdparty.WeChatClient;
import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest;
import com.freemud.sdk.api.assortment.order.response.order.GroupBuyResponse;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -30,7 +29,6 @@ import java.util.List;
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
......@@ -51,7 +49,6 @@ public class EcologyAdminApplicationClientTest {
getAuthorizerRequestDto.setPartnerId(partnerId);
getAuthorizerRequestDto.setAuthorizerAppid(appId);
GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
log.debug(getTokenResponseDto.toString());
}
@Test
......@@ -64,7 +61,6 @@ public class EcologyAdminApplicationClientTest {
GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
String accessToken = getTokenResponseDto.getResult().getAccessToken();
log.debug("token:{}", accessToken);
GroupBuyRequest groupBuyRequest = new GroupBuyRequest();
groupBuyRequest.setOut_trade_no("88888888");
......@@ -99,6 +95,5 @@ public class EcologyAdminApplicationClientTest {
//String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
log.debug(groupBuyResponse.toString());
}
}
order-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java
......@@ -5,7 +5,6 @@
//import com.alibaba.fastjson.JSON;
//import com.alibaba.fastjson.JSONObject;
//import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
......@@ -27,7 +26,6 @@
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//@Slf4j
//@RunWith(SpringRunner.class)
//@SpringBootTest
//@EnableDiscoveryClient
......
order-application-service/src/test/java/cn.freemud/client/MessageNoticeClientTest.java
......@@ -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.service.MessageCenterClient;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,9 +25,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* @date: 2018/6/25 10:58
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@RunWith(SpringRunner.class)
*/@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
@EnableFeignClients
......
order-application-service/src/test/java/cn.freemud/client/OpenPlatformClientTest.java
package cn.freemud.client;
import cn.freemud.entities.dto.GetWxappAccessTokenDto;
//import cn.freemud.service.thirdparty.OpenPlatformClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -12,7 +10,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.test.context.junit4.SpringRunner;
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
......
order-application-service/src/test/java/cn.freemud/client/PaymentClientTest.java
......@@ -5,7 +5,6 @@
////import cn.freemud.service.thirdparty.PaymentClient;
//import com.google.common.collect.Lists;
//import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
......
order-application-service/src/test/java/cn.freemud/client/StockClientTest.java
......@@ -16,9 +16,7 @@
//import cn.freemud.entities.dto.GetProductStockRequestDto;
//import cn.freemud.entities.dto.GetProductStockResponseDto;
//import cn.freemud.entities.dto.UpdateProductStockRequestDto;
//import cn.freemud.service.thirdparty.StockClient;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import cn.freemud.service.thirdparty.StockClient;//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
......@@ -31,7 +29,6 @@
//import java.util.Date;
//import java.util.List;
//
//@Slf4j
//@RunWith(SpringRunner.class)
//@SpringBootTest
//@EnableDiscoveryClient
......
order-application-service/src/test/java/cn.freemud/client/StoreClientTest.java
......@@ -2,7 +2,6 @@
//
//import cn.freemud.entities.dto.*;
//import cn.freemud.service.thirdparty.StoreClient;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,7 +25,6 @@
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//@Slf4j
//@RunWith(SpringRunner.class)
//@SpringBootTest
//@EnableDiscoveryClient
......
order-application-service/src/test/java/cn.freemud/client/StoreItemClientTest.java
......@@ -3,9 +3,7 @@ package cn.freemud.client;
import cn.freemud.entities.dto.*;
import cn.freemud.service.thirdparty.StoreItemClient;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import com.google.gson.Gson;import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
......@@ -28,7 +26,6 @@ import java.util.List;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
......
order-application-service/src/test/java/cn.freemud/client/WeChatClientTest.java
......@@ -5,7 +5,6 @@
//import cn.freemud.entities.dto.WechatSendMessageDto;
//import cn.freemud.service.thirdparty.WeChatClient;
//import com.google.gson.Gson;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
......
order-application-service/src/test/java/cn.freemud/manager/IappWxappConfigManagerTest.java
......@@ -14,14 +14,12 @@ package cn.freemud.manager;
import cn.freemud.entities.db.OpenPlatformIappWxappConfig;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
public class IappWxappConfigManagerTest {
......
order-application-service/src/test/java/cn.freemud/manager/PartnerManagerTest.java
......@@ -3,7 +3,6 @@ package cn.freemud.manager;
import cn.freemud.adapter.OrderAdapter;
import cn.freemud.entities.db.Partner;
import cn.freemud.service.impl.StoreServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -22,7 +21,6 @@ import org.springframework.test.context.junit4.SpringRunner;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
public class PartnerManagerTest {
......
order-application-service/src/test/java/cn.freemud/manager/TackCodeManagerTest.java
......@@ -4,7 +4,6 @@ import cn.freemud.adapter.OrderAdapter;
import cn.freemud.entities.db.Partner;
import cn.freemud.enums.OrderTackCodeFactory;
import cn.freemud.service.impl.StoreServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -25,7 +24,6 @@ import java.util.function.Function;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
public class TackCodeManagerTest {
......@@ -39,6 +37,5 @@ public class TackCodeManagerTest {
public void selectTackCode(){
String code = orderTackCodeManager.generateTackCode(5,"1864","1000221",null, OrderTackCodeFactory.getByOrderClient("2").getGenerateTackCodeFunc());
log.debug("code=="+code);
}
}
order-application-service/src/test/java/cn/freemud/amp/service/ProduceMQServiceTest.java
......@@ -5,7 +5,6 @@ import cn.freemud.amqp.MQAction;
import cn.freemud.amqp.MQMessage;
import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......
order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java
......@@ -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.OrderSourceType;
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
order-management/src/main/java/cn/freemud/management/annotations/LogIgnoreFeign.java 0 → 100644
package cn.freemud.management.annotations;
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Target(value = {ElementType.METHOD})
@Documented
@Inherited
public @interface LogIgnoreFeign {
/**
* 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
* @return
*/
boolean printLog() default true;
/**
* printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
*
* @return
*/
String[] excludeStatusCodes() default "100";
String statusCodeFieldName() default "code";
String messageFieldName() default "message";
}
order-management/src/main/java/cn/freemud/management/constant/ResponseCodeConstant.java 0 → 100644
package cn.freemud.management.constant;
import java.util.HashSet;
import java.util.Set;
public class ResponseCodeConstant {
public final static Integer RESPONSE_SUCCESS = 100;
public final static String RESPONSE_SUCCESS_STR = "100";
public final static String RESPONSE_CONFLICTS_STR = "105";
// coco券校验异常的错误
public final static String COCO_RESPONSE_COUPON_ERR_STR = "700";
public final static String RESPONSE_SUCCESS_OK = "ok";
public final static Integer RESPONSE_SUCCESS_1 = 1;
public final static String RESPONSE_SUCCESS_0_STR = "0";
public final static int RESPONSE_SUCCESS_0 = 0;
private final static Set<Object> successResponseCodeSet = new HashSet<>();
static {
successResponseCodeSet.add(RESPONSE_SUCCESS);
successResponseCodeSet.add(RESPONSE_SUCCESS_STR);
successResponseCodeSet.add(RESPONSE_SUCCESS_OK);
successResponseCodeSet.add(RESPONSE_SUCCESS_1);
successResponseCodeSet.add(RESPONSE_SUCCESS_0_STR);
successResponseCodeSet.add(RESPONSE_CONFLICTS_STR);
}
public static boolean isSuccessRespinseCode(Object o) {
return successResponseCodeSet.contains(o);
}
}
order-management/src/main/java/cn/freemud/management/constant/ResponseCodeKeyConstant.java 0 → 100644
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: ResponseCodeKeyConstant
* @Package cn.freemud.constant
* @Description:
* @author: song.cai
* @date: 2019/1/15 17:20
* @version V1.0
* @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package cn.freemud.management.constant;
import com.alibaba.fastjson.JSONObject;
import java.util.HashSet;
import java.util.Set;
public class ResponseCodeKeyConstant {
public final static String CODE = "code";
public final static String MESSAGE = "message";
public final static String STATUS_CODE = "statusCode";
public static final String MEG = "meg";
public static final String MSG = "msg";
/**
* code名称来源根据 ProductInfosDto
*/
public final static String ERR_CODE = "errcode";
/**
* errmsg名称来源根据 ProductInfosDto
*/
public static final String ERR_MSG = "errmsg";
private final static Set<String> responseCodeKeySet = new HashSet<>();
static {
responseCodeKeySet.add(CODE);
responseCodeKeySet.add(ERR_CODE);
responseCodeKeySet.add(STATUS_CODE);
}
public static Object getResponseCodeValue(JSONObject jsonObject) {
Object o = null;
for (String key : responseCodeKeySet) {
if ((o = jsonObject.get(key)) != null) {
break;
}
}
return o;
}
}
order-management/src/main/java/cn/freemud/management/controller/DeliveryOrderController.java
......@@ -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.LogParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
......
order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java
......@@ -41,7 +41,7 @@ public class OrderManagerController {
private OrderManagerAdapter orderManagerAdapter;
@ApiAnnotation(logMessage = "oms订单履单")
@ApiAnnotation(logMessage = "oms订单履单",printInfoLog = true)
@ApiOperation(value = "oms订单履单", notes = "订单履单", produces = "application/json")
@PostMapping("/statusOperate")
public BaseResponse deliveryCreate(@Validated @LogParams @RequestBody OrderManagerRequest request) {
......
order-management/src/main/java/cn/freemud/management/intercept/OrderExceptionHandler.java
......@@ -2,7 +2,6 @@ package cn.freemud.management.intercept;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.management.util.ResponseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
......
order-management/src/main/java/cn/freemud/management/service/handle/ActivityHandle.java
......@@ -5,10 +5,8 @@ import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundRespo
import cn.freemud.management.thirdparty.OMSActivityClient;
import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component
public class ActivityHandle {
......
order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java
package cn.freemud.management.thirdparty;
import cn.freemud.management.annotations.LogIgnoreFeign;
import cn.freemud.management.constant.ResponseCodeConstant;
import cn.freemud.management.constant.ResponseCodeKeyConstant;
import cn.freemud.management.entities.dto.request.order.MCCafeCouponLockRequest;
import cn.freemud.management.entities.dto.request.order.MCCafeCouponRequest;
import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponQueryResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@FeignClient(name = "OPEN-STORE-COUPON-ADAPTER-SERVICE",url="${saas.couponadapterclient.feign.url}")
@FeignClient(name = "OPEN-STORE-COUPON-ADAPTER-SERVICE", url = "${saas.couponadapterclient.feign.url}")
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface CouponOfflineMCCafeClient {
@PostMapping("/mccafe/redeem")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
CouponRedeemResponse redeem(MCCafeCouponRequest mcCafeCouponRequest);
@PostMapping("/mccafe/cancelRedeem")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
CouponRedeemResponse cancelRedeem(MCCafeCouponRequest mcCafeCouponRequest);
@PostMapping("/mccafe/query")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
CouponQueryResponse query(MCCafeCouponRequest mcCafeCouponRequest);
@PostMapping("/mccafe/batchQuery")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
McdNetBatchQueryResponse batchQuery(MCCafeCouponRequest mcCafeCouponRequest);
@PostMapping("/mccafe/lock")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
CouponBaseResponse lock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
@PostMapping("/mccafe/unlock")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
CouponBaseResponse unlock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
}
order-management/src/main/java/cn/freemud/management/thirdparty/CustomerMcCafeClient.java
......@@ -14,6 +14,8 @@
package cn.freemud.management.thirdparty;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.management.annotations.LogIgnoreFeign;
import cn.freemud.management.constant.ResponseCodeConstant;
import cn.freemud.management.entities.dto.request.customer.ForbiddenCardCodeRequest;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -25,5 +27,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
public interface CustomerMcCafeClient {
@PostMapping(value = "/customerextendservice/qujia/forbiddenCardCode")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR})
BaseResponse forbiddenCardCodeForQujia(@RequestBody ForbiddenCardCodeRequest request);
}
order-management/src/main/java/cn/freemud/management/thirdparty/DeliveryMCCafeClient.java
package cn.freemud.management.thirdparty;
import cn.freemud.management.annotations.LogIgnoreFeign;
import cn.freemud.management.constant.ResponseCodeConstant;
import cn.freemud.management.constant.ResponseCodeKeyConstant;
import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssemblyackRequest;
import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderHaltedRequest;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
......@@ -13,11 +16,13 @@ public interface DeliveryMCCafeClient {
// 配送停单
@PostMapping("/delivery/halted")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
DeliveryResponseDto halted(DeliveryOrderHaltedRequest deliveryOrderHaltedRequest);
/**、
* 入机成功通知配送
*/
@PostMapping("/delivery/assemblyack")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
DeliveryResponseDto assemblyAck(DeliveryOrderAssemblyackRequest request);
}
order-management/src/main/java/cn/freemud/management/thirdparty/MulitiPaymentClient.java
......@@ -13,6 +13,9 @@
package cn.freemud.management.thirdparty;
import cn.freemud.management.annotations.LogIgnoreFeign;
import cn.freemud.management.constant.ResponseCodeConstant;
import cn.freemud.management.constant.ResponseCodeKeyConstant;
import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
......@@ -30,11 +33,13 @@ public interface MulitiPaymentClient {
* 混合支付退款接口
*/
@PostMapping("/payment/application/refund")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, @RequestHeader("partnerId") String partnerId);
/**
* 批量支付退款
*/
@PostMapping("/payment/application/batch/refund")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
PayBatchRefundResponse batchRefund(BatchOrderRefundV2Request batchOrderRefundV2Request);
}
order-management/src/main/java/cn/freemud/management/thirdparty/OMSActivityClient.java
......@@ -13,6 +13,9 @@
package cn.freemud.management.thirdparty;
import cn.freemud.management.annotations.LogIgnoreFeign;
import cn.freemud.management.constant.ResponseCodeConstant;
import cn.freemud.management.constant.ResponseCodeKeyConstant;
import cn.freemud.management.entities.dto.request.activity.GroupWorkRefundRequest;
import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -29,6 +32,7 @@ public interface OMSActivityClient {
* @return
*/
@PostMapping("/activity/groupWork/refund")
@LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE, messageFieldName = ResponseCodeKeyConstant.MSG)
GroupWorkRefundResponse groupWorkRefund(GroupWorkRefundRequest groupWorkRefundRequest);
}
platform-sdk/src/main/java/cn/freemud/platform/sdk/hualala/HualalaSdkService.java
......@@ -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.SubmitOrderNewResponse;
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.factory.annotation.Autowired;
......@@ -26,11 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
//@Slf4j
public class HualalaSdkService {
@Autowired
private CloudService cloudService;
private Logger logger = LoggerFactory.getLogger(getClass());
// private Logger logger = LoggerFactory.getLogger(getClass());
public HualalaSdkService(CloudService cloudService) {
this.cloudService = cloudService;
......@@ -55,10 +51,10 @@ public class HualalaSdkService {
String body = getRequestBodyStr(finalRequest, baseConfig.getMerchantSecret());
requestHeader.setRequestBody(body);
requestHeader.setSignature(sign);
logger.info("桂源铺推送哗啦啦请求体：{} trackingNo:{}，orderCode：{}，requestHeader：{}",
JSONObject.toJSONString(finalRequest), trackingNo, requestBody.getThirdOrderID(), JSONObject.toJSONString(requestHeader));
// logger.info("桂源铺推送哗啦啦请求体：{} trackingNo:{}，orderCode：{}，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);
logger.info("桂源铺推送哗啦啦响应体：{} trackingNo:{}，orderCode：{}", JSONObject.toJSONString(submitOrderNewResponse), trackingNo, requestBody.getThirdOrderID());
// logger.info("桂源铺推送哗啦啦响应体：{} trackingNo:{}，orderCode：{}", JSONObject.toJSONString(submitOrderNewResponse), trackingNo, requestBody.getThirdOrderID());
return submitOrderNewResponse;
}
......@@ -72,7 +68,7 @@ public class HualalaSdkService {
String body = getRequestBodyStr(requestBody, "i28cUu3v");
requestHeader.setRequestBody(body);
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);
return submitOrderNewResponse;
}
......
pom.xml
......@@ -113,7 +113,7 @@
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>sdk-common-base</artifactId>
<version>2.1.BETA</version>
<version>2.2.BETA</version>
</dependency>
<!-- mybatis -->
......
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
......@@ -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.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java
package cn.freemud.aop;
import cn.freemud.base.entity.BaseResponse;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.core.Ordered;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
......@@ -23,7 +21,6 @@ import java.util.Optional;
*/
@Aspect
@Component
@Slf4j
public class IsConvertEnAspect implements Ordered {
@Pointcut("@annotation(cn.freemud.annotations.IsConvertEN)")
public void pointcut() {
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
......@@ -15,12 +15,9 @@ import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformCo
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformConfigManager;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.ThirdPartyLog;
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.Signature;
import org.aspectj.lang.annotation.Around;
......@@ -57,7 +54,6 @@ import java.util.Objects;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@Aspect
@Component
public class WebAspect {
......@@ -86,8 +82,6 @@ public class WebAspect {
private static final String APP_CHANNEL = "3";
private static Logger logger = LoggerFactory.getLogger(ShoppingSdkLogUtil.class);
/**
* 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link IgnoreFeignLogAnnotation}配置，输出响应报文里面所有的信息
*/
......@@ -174,8 +168,6 @@ public class WebAspect {
try {
result = joinPoint.proceed();
} catch (Exception ex) {
ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
throw ex;
}
try {
......@@ -185,7 +177,6 @@ public class WebAspect {
msig = (MethodSignature) sig;
Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
Object logReult = result;
ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
// 打印第三方出参日志
if (!this.printFeignResponseBodyLogForShopCart) {
IgnoreFeignLogAnnotation logIgnore = currentMethod.getAnnotation(IgnoreFeignLogAnnotation.class);
......@@ -205,7 +196,6 @@ public class WebAspect {
thirdPartLogVo.getUri(), thirdPartLogVo.getRequestBody(), logReult);
}
} catch (Exception e) {
LogUtil.error("WebAspect Feign Log Ignore error {}", "","",e);
}
return result;*/
long start = System.currentTimeMillis();
......@@ -266,8 +256,6 @@ public class WebAspect {
* try {
* result = joinPoint.proceed();
* } catch (Exception ex) {
* ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
* LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
* throw ex;
* }
* try {
......@@ -278,7 +266,6 @@ public class WebAspect {
* Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
* <p>
* Object logReult = result;
* ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
* // 打印第三方出参日志
* if (!this.printFeignResponseBodyLog) {
* IgnoreFeignLogAnnotation logIgnore = currentMethod.getAnnotation(IgnoreFeignLogAnnotation.class);
......
shopping-cart-application-service/src/main/java/cn/freemud/config/WebMvcConfig.java
......@@ -11,7 +11,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
......@@ -26,7 +25,6 @@ import java.util.List;
* WebMvcConfigurer
*/
@Configuration
//@Slf4j
public class WebMvcConfig implements WebMvcConfigurer {
@Bean
public ObjectMapper objectMapper(){
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/CollageOrderController.java
......@@ -20,7 +20,6 @@ import com.freemud.application.sdk.api.log.LogParams;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/MCoffeeShoppingCartController.java
......@@ -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.LogParams;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
......@@ -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.LogParams;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/controller/ShoppingCartDemoController.java
......@@ -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.LogParams;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import ma.glasnost.orika.MapperFacade;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections4.CollectionUtils;
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/KgdCouponServiceImpl.java
......@@ -24,11 +24,8 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.RedisUtil;
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.google.common.base.Joiner;
import com.google.common.collect.Lists;
......@@ -104,7 +101,6 @@ public class KgdCouponServiceImpl implements CouponService {
// 如果是商品券/换购券,获取券信息
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())) {
return null;
......@@ -160,7 +156,6 @@ public class KgdCouponServiceImpl implements CouponService {
GetProductBySkuIdBO getProductBySkuIdBO = convert2GetProductBySkuIdBO(getCheckSpqBo,skuId);
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);
if (null == productsVo || !Objects.equals(productsVo.getStatus(), StoreItemStatus.PUT_ON_SALE.getCode())) {
return null;
......
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