Skip to content

O
order-group
Commit 56b7c8b3 by hanghang.wang
Options

Merge remote-tracking branch 'origin/feature/20210226_【C端服务端】订单状态新增英文字段_wanghanghang' into develop 

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/BigDataFeiginClient.java
parents 4cf18385 e4f62a75
Showing with 390 additions and 75 deletions
order-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java 0 → 100644
package cn.freemud.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Retention(RetentionPolicy.RUNTIME)
public @interface IsConvertEN {
//此字段用于区分具体服务。
//区分服务之后寻找对应服务的返回code枚举类
String service() default "";
}
order-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java 0 → 100644
package cn.freemud.aop;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.enums.ResponseResult;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogParams;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.service.EmailAlertService;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.*;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
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;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.util.*;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Aspect
@Component
@Slf4j
public class IsConvertEnAspect implements Ordered {
@Pointcut("@annotation(cn.freemud.annotations.IsConvertEN)")
public void pointcut() {
}
@Around("pointcut()")
public Object convertMessage(ProceedingJoinPoint joinPoint) throws Throwable {
HttpServletRequest request = currentRequest();
String language = request.getHeader("lang");
BaseResponse baseResponse = (BaseResponse) joinPoint.proceed();
//表示返回英文提示
if ("en-US".equals(language)) {
/**此处注释**/
String enMessage = ResponseResult.getResponseResult(baseResponse.getCode()).getEnMessage();
if (!StringUtils.isEmpty(enMessage)) {
baseResponse.setMessage(enMessage);
}
}
return baseResponse;
}
private HttpServletRequest currentRequest() {
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return Optional.ofNullable(servletRequestAttributes).map(ServletRequestAttributes::getRequest).orElse(null);
}
/**
* 备用方法，避免code或者message信息不统一
* 过滤返参code是否在excludeStatusCodes存在
*
* @param excludeStatusCodes
* @param statusCodeValue
* @return
*/
private boolean containStatusCode(String[] excludeStatusCodes, String statusCodeValue) {
if (excludeStatusCodes == null || excludeStatusCodes.length == 0) {
return false;
}
for (int i = 0; i < excludeStatusCodes.length; i++) {
if (excludeStatusCodes[i].equals(statusCodeValue)) {
return true;
}
}
return false;
}
@Override
public int getOrder() {
return 0;
}
}
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
......@@ -12,6 +12,7 @@
*/
package cn.freemud.controller;
import cn.freemud.annotations.IsConvertEN;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
......@@ -67,6 +68,7 @@ public class OrderController {
/**
* 创建订单
*/
@IsConvertEN
@ApiAnnotation(logMessage = "createOrder")
@PostMapping("/createOrder")
public BaseResponse createOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
......@@ -159,6 +161,7 @@ public class OrderController {
* @param queryOrderVo
* @return
*/
@IsConvertEN
@ApiAnnotation(logMessage = "previewOrderInfo")
@PostMapping("/previewOrderInfo")
public BaseResponse previewOrderInfo(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
......@@ -175,6 +178,7 @@ public class OrderController {
* @param queryOrderVo
* @return
*/
@IsConvertEN
@ApiAnnotation(logMessage = "previewOrderInfoSvcCheck")
@PostMapping("/previewOrderInfoSvcCheck")
public BaseResponse previewOrderInfoSvcCheck(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
......@@ -295,6 +299,7 @@ public class OrderController {
/**
* 查询桌号是否开台
*/
@IsConvertEN
@ApiAnnotation(logMessage = "queryTableNumberStatus")
@ApiOperation(value = "查询桌号是否开台", notes = "查询桌号是否开台", produces = "application/json")
@PostMapping("/queryTableNumberStatus")
......
order-application-service/src/main/java/cn/freemud/entities/dto/OrderViewStatusDto.java
......@@ -26,6 +26,10 @@ public class OrderViewStatusDto {
*/
private String orderStatusDesc;
/**
* 订单类型描述
*/
private String orderStatusDescEn;
/**
* 订单类型描述文案
*/
private String orderStatusDescText;
......
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
......@@ -143,6 +143,10 @@ public class QueryOrderResponseVo {
*/
private String orderTypeDesc;
/**
* 订单类型描述
*/
private String orderTypeDescEn;
/**
* 订单状态 enum OrderStatus ,DeliverStatus=42 骑手取餐中
*/
private Integer orderStatus;
......@@ -151,6 +155,10 @@ public class QueryOrderResponseVo {
*/
private String orderStatusDesc;
/**
* 订单状态描述
*/
private String orderStatusDescEn;
/**
* 订单状态显示的对应描述
*/
private String orderStatusDescText;
......@@ -205,6 +213,10 @@ public class QueryOrderResponseVo {
*/
private String payStatusDesc;
/**
* 支付状态描述英文
*/
private String payStatusDescEn;
/**
* 支付时间
*/
private String payCreateTime;
......@@ -212,6 +224,11 @@ public class QueryOrderResponseVo {
* 付款方式 微信支付
*/
private String orderPayType;
/**
* 付款方式 微信支付
*/
private String orderPayTypeDescEn;
/**
* 收货地址id
*/
......@@ -242,6 +259,11 @@ public class QueryOrderResponseVo {
private String refundStatusDesc;
/**
* 退款状态描述
*/
private String refundStatusDescEn;
/**
* 退款原因
*/
private String refundReason;
......
order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java
......@@ -65,6 +65,8 @@ public class PreviewOrderInfoVo {
*/
private String orderStatusDesc;
private String orderStatusDescEn;
/**
* 支付状态 enum PayStatus
*/
......@@ -73,6 +75,10 @@ public class PreviewOrderInfoVo {
* 支付状态描述
*/
private String payStatusDesc;
/**
* 支付状态描述英文
*/
private String payStatusDescEn;
/**
* 订单修改版本号
......
order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
......@@ -14,21 +14,23 @@ package cn.freemud.enums;
public enum OrderStatus {
TAKE_ORDER(1, "下单"),
WAIT_PAY(2, "待支付"),
RECEIPT(3, "接单"),
DISTRIBUTION(4, "配送中"),
COMPLETE(5, "完成"),
CALCEL(6, "取消"),
REFUSE(7,"拒单"),
COMPLETE_MAKE(31, "制作完成");
TAKE_ORDER(1, "下单","place an order"),
WAIT_PAY(2, "待支付","To be paid"),
RECEIPT(3, "接单","Receiving orders"),
DISTRIBUTION(4, "配送中","In delivery"),
COMPLETE(5, "完成","Complete"),
CALCEL(6, "取消","Cancel"),
REFUSE(7,"拒单","Refuse to accept orders"),
COMPLETE_MAKE(31, "制作完成","Production completed");
private Integer code;
private String desc;
private String descEn;
OrderStatus(Integer code, String desc) {
OrderStatus(Integer code, String desc,String descEn) {
this.code = code;
this.desc = desc;
this.descEn = descEn;
}
public static Integer[] getAllCodes() {
......@@ -53,6 +55,14 @@ public enum OrderStatus {
return null;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
public Integer getCode() {
return code;
}
......
order-application-service/src/main/java/cn/freemud/enums/PayStatus.java
......@@ -14,19 +14,21 @@ package cn.freemud.enums;
public enum PayStatus {
NOT_PAY(1, "未支付"),
HAVE_PAID(2, "已支付"),
HAVE_REFUND(3, "已退款"),
HAVE_PART_REFUND(4, "已经部分退款"),
COMPLETE(5, "完成");
NOT_PAY(1, "未支付","Unpaid"),
HAVE_PAID(2, "已支付","Paid"),
HAVE_REFUND(3, "已退款","Refunded"),
HAVE_PART_REFUND(4, "已经部分退款","Partial refund"),
COMPLETE(5, "完成","Complete");
private Integer code;
private String desc;
private String descEn;
PayStatus(Integer code, String desc) {
PayStatus(Integer code, String desc,String descEn) {
this.code = code;
this.desc = desc;
this.descEn = descEn;
}
public static PayStatus getByCode(Integer code) {
......@@ -56,4 +58,12 @@ public enum PayStatus {
public void setDesc(String desc) {
this.desc = desc;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
}
order-application-service/src/main/java/cn/freemud/enums/RefundStatus.java
......@@ -14,19 +14,23 @@ package cn.freemud.enums;
public enum RefundStatus {
APPLY_REFUND(1, "申请退款"),
AGREE_REFUND(2, "同意退款"),
ALREADY_REFUND(3, "已退货"),
COMPLETE_REFUND(4, "退款完成"),
REFUSE_REFUND(5, "拒绝退款");
APPLY_REFUND(1, "申请退款","Apply for a refund"),
AGREE_REFUND(2, "同意退款","Agree to refund"),
ALREADY_REFUND(3, "已退货","Returned"),
COMPLETE_REFUND(4, "退款完成","Refund complete"),
REFUSE_REFUND(5, "拒绝退款","Refuse refund");
/**编号**/
private Integer code;
/**中文**/
private String desc;
/**英文**/
private String descEn;
RefundStatus(Integer code, String desc) {
RefundStatus(Integer code, String desc, String descEn) {
this.code = code;
this.desc = desc;
this.descEn = descEn;
}
public static RefundStatus getByCode(Integer code) {
......@@ -53,4 +57,12 @@ public enum RefundStatus {
public void setDesc(String desc) {
this.desc = desc;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
}
order-application-service/src/main/java/cn/freemud/interceptor/ServiceException.java
......@@ -15,9 +15,12 @@ public class ServiceException extends RuntimeException {
private String message;
private String enMessage;
public ServiceException(ResponseResult result) {
this.result = result;
this.message = result.getMessage();
this.enMessage = result.getEnMessage();
}
public ServiceException(ResponseResult result, String message) {
......@@ -42,4 +45,12 @@ public class ServiceException extends RuntimeException {
public void setMessage(String message) {
this.message = message;
}
public String getEnMessage() {
return enMessage;
}
public void setEnMessage(String enMessage) {
this.enMessage = enMessage;
}
}
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -83,6 +83,7 @@ import java.util.stream.Collectors;
* @Copyright: ${DATE.YARE} www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@Service
public class EncircleOrderServiceImpl implements EncircleOrderService {
......@@ -148,7 +149,6 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeTable.getCode()) || storeTable.getData() == null) return ResponseUtil.error(ResponseResult.STORE_NOT_TABLE_INFO);
if(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR);
if(storeTable.getData().getOrderState() == 1) {
ApiLog.debug("门店返回1,已开台");
return ResponseUtil.success();
}
/**
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java
......@@ -7,17 +7,18 @@ import lombok.Getter;
@AllArgsConstructor
public enum PayChannelType {
WECHAT((byte)1,"10211","微信"),
ALIPAY((byte)2,"10300","支付宝"),
SVC((byte)3,"10102","储值卡"),
COMB((byte)4,"10212","混合支付"),
USVCP((byte)5,"10556", "电子风味卡支付"),
ZERO((byte)6,"100000", "0元支付"),
TIKTOKPAY((byte)7,"10066", "抖音支付");
WECHAT((byte)1,"10211","微信","wechat"),
ALIPAY((byte)2,"10300","支付宝","alipay"),
SVC((byte)3,"10102","储值卡","svc"),
COMB((byte)4,"10212","混合支付","comb"),
USVCP((byte)5,"10556", "电子风味卡支付","usvcp"),
ZERO((byte)6,"100000", "0元支付","zero"),
TIKTOKPAY((byte)7,"10066", "抖音支付","tiktokpay");
private Byte index;
private String ebcode;
private String name;
private String nameEn;
public static final String API_DESC = "订单支付渠道类型 1:微信 2:储值卡 3:支付宝 4:混合支付,5:电子风味卡支付";
......
shopping-cart-application-service/src/main/java/cn/freemud/annotations/IsConvertEN.java 0 → 100644
package cn.freemud.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Retention(RetentionPolicy.RUNTIME)
public @interface IsConvertEN {
//传入服务名，用于区分枚举类
String service() default "";
}
shopping-cart-application-service/src/main/java/cn/freemud/aop/LogIgnore.java → shopping-cart-application-service/src/main/java/cn/freemud/annotations/LogIgnore.java
package cn.freemud.aop;
package cn.freemud.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* @author
* @author wanghanghang
*/
@Retention(RetentionPolicy.RUNTIME)
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/ControllerLogAop.java
package cn.freemud.aop;
import cn.freemud.annotations.LogIgnore;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation;
......@@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
......@@ -53,7 +53,7 @@ public class ControllerLogAop implements Ordered {
@Value("${exclude-print-body-log-methods:findNearPickUpStores,getMenuCategory}")
private volatile List<String> excludePrintBodyLogMethods = Lists.newArrayList();
@Pointcut("@annotation(cn.freemud.aop.LogIgnore)")
@Pointcut("@annotation(cn.freemud.annotations.LogIgnore)")
public void pointcut() {
}
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java 0 → 100644
package cn.freemud.aop;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.enums.ResponseResult;
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;
import javax.servlet.http.HttpServletRequest;
import java.util.Optional;
/**
* 判断返回message是否转换为英文
*
* @author wanghanghang
* @date 2021/04/01
*/
@Aspect
@Component
@Slf4j
public class IsConvertEnAspect implements Ordered {
@Pointcut("@annotation(cn.freemud.annotations.IsConvertEN)")
public void pointcut() {
}
@Around("pointcut()")
public Object convertMessage(ProceedingJoinPoint joinPoint) throws Throwable {
HttpServletRequest request = currentRequest();
String language = request.getHeader("lang");
BaseResponse baseResponse = (BaseResponse) joinPoint.proceed();
//表示返回英文提示 本次变更3个提示 手动直接转换
if ("en-US".equals(language)) {
switch (baseResponse.getCode()) {
case "44013":
//购物车商品有变动，请手动刷新再修改
baseResponse.setMessage("Shopping cart items have changed, please refresh and modify manually");
break;
case "44014":
//没有绑定桌号，无法加入购物车
baseResponse.setMessage("There is no binding table number, unable to join the shopping cart");
break;
case "44003":
//添加购物车失败
baseResponse.setMessage("Failed to add shopping cart");
break;
case "43005":
//门店商品校验失败
baseResponse.setMessage("Store product verification failed");
break;
case "43003":
//门店商品信息不存在
baseResponse.setMessage("Store product information does not exist");
break;
}
}
return baseResponse;
}
private HttpServletRequest currentRequest() {
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return Optional.ofNullable(servletRequestAttributes).map(ServletRequestAttributes::getRequest).orElse(null);
}
/**
* 备用方法，避免code或者message信息不统一
* 过滤返参code是否在excludeStatusCodes存在
*
* @param excludeStatusCodes
* @param statusCodeValue
* @return
*/
private boolean containStatusCode(String[] excludeStatusCodes, String statusCodeValue) {
if (excludeStatusCodes == null || excludeStatusCodes.length == 0) {
return false;
}
for (int i = 0; i < excludeStatusCodes.length; i++) {
if (excludeStatusCodes[i].equals(statusCodeValue)) {
return true;
}
}
return false;
}
@Override
public int getOrder() {
return 0;
}
}
shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
package cn.freemud.aop;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.CommonRedisKeyConstant;
import cn.freemud.entities.vo.ThirdPartLogVo;
import cn.freemud.enums.CommonResponseResult;
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
......@@ -12,12 +12,11 @@
*/
package cn.freemud.controller;
import cn.freemud.aop.LogIgnore;
import cn.freemud.annotations.LogIgnore;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.vo.*;
import cn.freemud.enums.ResponseResult;
import cn.freemud.service.impl.ShoppingCartCollageServiceImpl;
import cn.freemud.service.impl.ShoppingCartMallServiceImpl;
import cn.freemud.utils.ResponseUtil;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ApiAnnotation;
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
......@@ -12,7 +12,8 @@
*/
package cn.freemud.controller;
import cn.freemud.aop.LogIgnore;
import cn.freemud.annotations.IsConvertEN;
import cn.freemud.annotations.LogIgnore;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.demo.controller.ShoppingCartDemoController;
......@@ -79,6 +80,7 @@ public class ShoppingCartController {
/**
* 向购物车中添加商品
*/
@IsConvertEN
@PostMapping(value = "/addGoods")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "addGoods")
public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
......@@ -94,6 +96,7 @@ public class ShoppingCartController {
/**
* 修改购物车中商品数量
*/
@IsConvertEN
@PostMapping(value = "/updateGoodsQty")
@LogIgnore(logMessage = "updateGoodsQty")
public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
......@@ -109,6 +112,7 @@ public class ShoppingCartController {
/**
* 查询购物车信息
*/
@IsConvertEN
@PostMapping(value = "/listCartGoods")
@LogIgnore(logMessage = "listCartGoods")
public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
......@@ -142,6 +146,7 @@ public class ShoppingCartController {
/**
* 清空购物车
*/
@IsConvertEN
@PostMapping(value = "/clearCartGoods")
@LogIgnore(logMessage = "clearCartGoods")
public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
......@@ -162,6 +167,7 @@ public class ShoppingCartController {
* @param getShoppingCartGoodsApportionRequestVo
* @return
*/
@IsConvertEN
@PostMapping(value = "/getShoppingCartGoodsApportion")
@LogIgnore(logMessage = "getShoppingCartGoodsApportion")
public BaseResponse getShoppingCartGoodsApportion(@Validated @LogParams @RequestBody GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo) {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
......@@ -12,13 +12,11 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
import com.freemud.application.sdk.api.base.BaseResponse;
import com.freemud.application.sdk.api.promotioncenter.response.CalculationDiscountResponseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/BigDataFeiginClient.java
//package cn.freemud.service.thirdparty;
//
//import cn.freemud.aop.IgnoreFeignLogAnnotation;
//import cn.freemud.constant.ResponseCodeConstant;
//import cn.freemud.constant.ResponseCodeKeyConstant;
//import cn.freemud.entities.dto.BuryingPointBigDto;
//import cn.freemud.entities.dto.BuryingPointResDto;
//import org.springframework.cloud.openfeign.FeignClient;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestMapping;
//
///**
// * @program: micro_progeram_service
// * @description: 大数据
// * @author: xinqi.wang
// * @create: 2019-02-22 11:12
// **/
//@FeignClient(name = "BIGDATACLIENT", url = "${saas.bigdataclient.feign.url}")
//@RequestMapping(produces = {"application/json;charset=UTF-8"})
//public interface BigDataFeiginClient {
//
// @PostMapping("/collector/v2/buryPoint")
// public BuryingPointResDto syncLoginData(BuryingPointBigDto buryingPointBigDto);
//
//
//}
//
\ No newline at end of file
package cn.freemud.service.thirdparty;
import cn.freemud.entities.dto.BuryingPointBigDto;
import cn.freemud.entities.dto.BuryingPointResDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* @program: micro_progeram_service
* @description: 大数据
* @author: xinqi.wang
* @create: 2019-02-22 11:12
**/
@FeignClient(name = "BIGDATACLIENT", url = "${saas.bigdataclient.feign.url}")
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface BigDataFeiginClient {
@PostMapping("/collector/v2/buryPoint")
public BuryingPointResDto syncLoginData(BuryingPointBigDto buryingPointBigDto);
}
\ No newline at end of file
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CalculationClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.calculate.CalculationSharingDiscountRequestDto;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CardBinClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.GetPaidRuleRequestDto;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StockClient.java
......@@ -12,7 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StoreItemClient.java
......@@ -12,7 +12,7 @@
*/
package cn.freemud.service.thirdparty;
import cn.freemud.aop.IgnoreFeignLogAnnotation;
import cn.freemud.annotations.IgnoreFeignLogAnnotation;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.*;
......
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