Skip to content

O
order-group
Commit 51550825 by hanghang.wang
Options

升级sdk

parent 7058bd2c
Showing with 71 additions and 45 deletions
order-application-service/src/main/java/cn/freemud/aop/LogIgnoreAspect.java
......@@ -47,7 +47,7 @@ public class LogIgnoreAspect implements Ordered {
/**
* 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link LogIgnore}配置，输出响应报文里面所有的信息
*/
@Value("${print-response-body-log-order-aoolication-service:false}")
@Value("${print-response-body-log-order-application-service:false}")
private volatile boolean printResponseBodyLog = false;
/**
......
order-application-service/src/main/java/cn/freemud/aop/LogIgnoreFeignAspect.java
......@@ -35,7 +35,7 @@ public class LogIgnoreFeignAspect {
/**
* 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link LogIgnore}配置，输出响应报文里面所有的信息
*/
@Value("${print-feign-response-body-log-order-aoolication-service:true}")
@Value("${print-feign-response-body-log-order-application-service:true}")
private volatile boolean printFeignResponseBodyLog = true;
@Pointcut("execution(* cn.freemud.service.thirdparty..*.*(..))")
......
order-application-service/src/main/java/cn/freemud/constant/ResponseCodeKeyConstant.java
......@@ -19,12 +19,28 @@ import java.util.HashSet;
import java.util.Set;
public class ResponseCodeKeyConstant {
public final static String CODE = "code";
public final static String ERR_CODE = "errcode";
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";
/**
* errcode名称来源根据 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<>();
......
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
......@@ -65,7 +65,7 @@ public class OrderController {
/**
* 创建订单之前校验前面排队的订单数
*/
@ApiAnnotation(logMessage = "checkBeforeCreateOrder")
@LogIgnore(logMessage = "checkBeforeCreateOrder")
@PostMapping("/checkBeforeCreateOrder")
public BaseResponse checkBeforeCreateOrder(@Validated @LogParams @RequestBody CheckBeforeCreateOrderRequestVo checkBeforeCreateOrderRequestVo) {
long start = System.currentTimeMillis();
......@@ -82,7 +82,7 @@ public class OrderController {
* 创建订单
*/
@IsConvertEN
@ApiAnnotation(logMessage = "createOrder")
@LogIgnore(logMessage = "createOrder")
@PostMapping("/createOrder")
public BaseResponse createOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
return orderAdapterService.createOrderNew(createOrderVo);
......@@ -91,7 +91,7 @@ public class OrderController {
/**
* 通用创建订单
*/
@ApiAnnotation(logMessage = "createOrderUniversal")
@LogIgnore(logMessage = "createOrderUniversal")
@PostMapping("/createOrderUniversal")
public BaseResponse createOrderUniversal(@Validated @LogParams @RequestBody Map<String, Object> param) {
return orderAdapterService.createOrderUniversal(param);
......@@ -100,7 +100,7 @@ public class OrderController {
/**
* 麦咖啡创建订单
*/
@ApiAnnotation(logMessage = "createMCCafeOrder")
@LogIgnore(logMessage = "createMCCafeOrder")
@PostMapping("/MCoffee/createMCCafeOrder")
public BaseResponse createOrderMCCafe(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
return orderAdapterService.createMCCafeOrder(createOrderVo);
......@@ -109,7 +109,7 @@ public class OrderController {
/**
* 扫脸支付下单
*/
@ApiAnnotation(logMessage = "scanFaceCreateOrder")
@LogIgnore(logMessage = "scanFaceCreateOrder")
@PostMapping("/scanFaceCreateOrder")
public BaseResponse scanFaceCreateOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
return orderservice.scanFaceCreateOrder(createOrderVo);
......@@ -118,7 +118,7 @@ public class OrderController {
/**
* APP下单，下单带商品信息，不经过购物车服务，不唤起支付
*/
@ApiAnnotation(logMessage = "appCreateOrder")
@LogIgnore(logMessage = "appCreateOrder")
@PostMapping("/app/create")
public BaseResponse appCreateOrder(@Validated @LogParams @RequestBody AppCreateOrderVo createOrderVo, BindingResult bindingResult) {
return orderAdapterService.appCreateOrder(createOrderVo);
......@@ -127,7 +127,7 @@ public class OrderController {
/**
* 订单支付成功后通知
*/
@ApiAnnotation(logMessage = "paySuccessCallback")
@LogIgnore(logMessage = "paySuccessCallback")
@PostMapping("/paySuccessCallback")
public String paySuccessCallback(@LogParams @RequestBody PaysuccessNoticeMessage message) {
return orderAdapterService.paySuccessCallback(message);
......@@ -136,7 +136,7 @@ public class OrderController {
/**
* 订单支付成功后通知
*/
@ApiAnnotation(logMessage = "newPaySuccessCallback")
@LogIgnore(logMessage = "newPaySuccessCallback")
@PostMapping({"/newPaySuccessCallback","/openStoreQueryPaymentCallback"})
public String newPaySuccessCallback(@LogParams @RequestBody NewPaysuccessNoticeMessage message) {
return orderservice.newPaySuccessCallback(message);
......@@ -154,7 +154,7 @@ public class OrderController {
/**
* 退款回掉通知
*/
@ApiAnnotation(logMessage = "refundNotifyCallback")
@LogIgnore(logMessage = "refundNotifyCallback")
@PostMapping("/refundNotifyCallback")
public String refundNotifyCallback(@LogParams @RequestBody RefundNotifyCallbackRequestVo requestVo) {
return orderservice.refundNotifyCallback(requestVo);
......@@ -165,7 +165,7 @@ public class OrderController {
*/
// @ApiAnnotation(logMessage = "queryOrders")
@PostMapping("/queryOrders")
@LogIgnore
@LogIgnore(logMessage = "queryOrders")
public BaseResponse queryOrders(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
return orderservice.queryOrders(queryOrderVo);
}
......@@ -173,7 +173,7 @@ public class OrderController {
/**
* 查询麦咖啡订单列表
*/
@ApiAnnotation(logMessage = "maCafeQueryOrders")
@LogIgnore(logMessage = "maCafeQueryOrders")
@PostMapping("/maCafeQueryOrders")
public BaseResponse maCafeQueryOrders(@Validated @LogParams @RequestBody McCafeQueryOrderVo queryOrderVo) {
return orderservice.mcCafeQueryOrders(queryOrderVo);
......@@ -185,7 +185,7 @@ public class OrderController {
* @return
*/
@IsConvertEN
@ApiAnnotation(logMessage = "previewOrderInfo")
@LogIgnore(logMessage = "previewOrderInfo")
@PostMapping("/previewOrderInfo")
public BaseResponse previewOrderInfo(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
CreateReserveOrderVo createReserveOrderVo = new CreateReserveOrderVo();
......@@ -202,7 +202,7 @@ public class OrderController {
* @return
*/
@IsConvertEN
@ApiAnnotation(logMessage = "previewOrderInfoSvcCheck")
@LogIgnore(logMessage = "previewOrderInfoSvcCheck")
@PostMapping("/previewOrderInfoSvcCheck")
public BaseResponse previewOrderInfoSvcCheck(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
CreateReserveOrderVo createReserveOrderVo = new CreateReserveOrderVo();
......@@ -218,7 +218,7 @@ public class OrderController {
/**
* 获取订单详情
*/
@ApiAnnotation(logMessage = "queryOrderById")
@LogIgnore(logMessage = "queryOrderById")
@PostMapping("/queryOrderById")
public BaseResponse queryOrderById(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
return orderservice.queryOrderById(queryOrderVo.getOperation(),queryOrderVo.getSessionId(), queryOrderVo.getOid(),queryOrderVo.getPartnerId(),queryOrderVo.getChannelType());
......@@ -228,7 +228,7 @@ public class OrderController {
/**
* 麦咖啡 获取订单详情
*/
@ApiAnnotation(logMessage = "mcCafeQueryOrderById")
@LogIgnore(logMessage = "mcCafeQueryOrderById")
@PostMapping("/mcCafeQueryOrderById")
public BaseResponse mcCafeQueryOrderById(@Validated @LogParams @RequestBody MaCafeQueryOrderVo queryOrderVo) {
return orderservice.mcCafeQueryOrderById(queryOrderVo);
......@@ -237,7 +237,7 @@ public class OrderController {
/**
* 取消支付订单
*/
@ApiAnnotation(logMessage = "cancelPayOrder")
@LogIgnore(logMessage = "cancelPayOrder")
@PostMapping("/cancelPayOrder")
public BaseResponse cancelPayOrder(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
return orderservice.cancelPayOrder(deleteOrderVo);
......@@ -246,7 +246,7 @@ public class OrderController {
/**
* 取消支付删除订单
*/
@ApiAnnotation(logMessage = "deleteOrder")
@LogIgnore(logMessage = "deleteOrder")
@PostMapping("/deleteOrder")
public BaseResponse deleteOrder(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
return orderservice.deleteOrder(deleteOrderVo);
......@@ -255,7 +255,7 @@ public class OrderController {
/**
* 取消支付删除订单
*/
@ApiAnnotation(logMessage = "deleteOrderById")
@LogIgnore(logMessage = "deleteOrderById")
@PostMapping("/deleteOrderById")
public BaseResponse deleteOrderById(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
//return orderservice.deleteOrderById(deleteOrderVo);
......@@ -265,7 +265,7 @@ public class OrderController {
/**
* 用户申请退款
*/
@ApiAnnotation(logMessage = "refund")
@LogIgnore(logMessage = "refund")
@PostMapping("/refund")
public BaseResponse refund(@Validated @LogParams @RequestBody OrderRefundVo orderRefundVo) {
return orderservice.orderRefund(orderRefundVo);
......@@ -274,7 +274,7 @@ public class OrderController {
/**
* 麦咖啡用户申请退款
*/
@ApiAnnotation(logMessage = "mcCafeRefund")
@LogIgnore(logMessage = "mcCafeRefund")
@PostMapping("/MCoffee/mcCafeRefund")
public BaseResponse mcCafeRefund(@Validated @LogParams @RequestBody OrderRefundVo orderRefundVo) {
return mcCafeOrderService.orderRefund(orderRefundVo);
......@@ -283,7 +283,7 @@ public class OrderController {
/**
* 退款回掉通知
*/
@ApiAnnotation(logMessage = "mcCafeRefundNotifyCallback")
@LogIgnore(logMessage = "mcCafeRefundNotifyCallback")
@PostMapping("/MCoffee/mcCafeRefundNotifyCallback")
public String mcCafeRefundNotifyCallback(@LogParams @RequestBody RefundNotifyCallbackRequestVo requestVo) {
return mcCafeOrderService.mcCafeRefundNotifyCallback(requestVo);
......@@ -292,7 +292,7 @@ public class OrderController {
/**
* 获取订单排队号
*/
@ApiAnnotation(logMessage = "queueIndex")
@LogIgnore(logMessage = "queueIndex")
@PostMapping("/queueIndex")
public BaseResponse getOrderQueueIndex(@Validated @LogParams @RequestBody QueryOrderQueueIndexVo queryOrderQueueIndexVo) {
return orderservice.queryOrderQueueIndex(queryOrderQueueIndexVo);
......@@ -302,7 +302,7 @@ public class OrderController {
/**
* 获取申请退款理由 1.9后作废
*/
@ApiAnnotation(logMessage = "getOrderRefundReason")
@LogIgnore(logMessage = "getOrderRefundReason")
@ApiOperation(value = "获取申请退款理由", notes = "获取申请退款理由", produces = "application/json")
@PostMapping("/getOrderRefundReason")
public BaseResponse getRefundReason(@LogParams @RequestBody GetRefundReasonVo getRefundReasonVo) {
......@@ -312,7 +312,7 @@ public class OrderController {
/**
* 获取申请退款理由
*/
@ApiAnnotation(logMessage = "getNewOrderRefundReason")
@LogIgnore(logMessage = "getNewOrderRefundReason")
@ApiOperation(value = "获取申请退款理由", notes = "获取申请退款理由", produces = "application/json")
@PostMapping("/getNewOrderRefundReason")
public BaseResponse getNewRefundReason(@LogParams @RequestBody GetRefundReasonVo getRefundReasonVo) {
......@@ -323,7 +323,7 @@ public class OrderController {
* 查询桌号是否开台
*/
@IsConvertEN
@ApiAnnotation(logMessage = "queryTableNumberStatus")
@LogIgnore(logMessage = "queryTableNumberStatus")
@ApiOperation(value = "查询桌号是否开台", notes = "查询桌号是否开台", produces = "application/json")
@PostMapping("/queryTableNumberStatus")
public BaseResponse queryTableNumberStatus(@LogParams @RequestBody EncircleReserveBaseVo encircleReserveBaseVo) {
......@@ -333,7 +333,7 @@ public class OrderController {
/**
* 查询30分钟未支付的优惠券订单
*/
@ApiAnnotation(logMessage = "queryOrderWithCoupon")
@LogIgnore(logMessage = "queryOrderWithCoupon")
@ApiOperation(value = "查询30分钟未支付的优惠券订单", notes = "查询30分钟未支付的优惠券订单", produces = "application/json")
@PostMapping("/queryOrderWithCoupon")
public BaseResponse queryOrderWithCoupon(@LogParams @RequestBody QueryOrderWithCouponVo orderWithCouponVo) {
......@@ -343,7 +343,7 @@ public class OrderController {
/**
* 订单确认完成
*/
@ApiAnnotation(logMessage = "affirm")
@LogIgnore(logMessage = "affirm")
@PostMapping("/affirm")
public BaseResponse orderAffirm(@Validated @LogParams @RequestBody OrderAffirmRequestVO request) {
return mallOrderService.orderAffirm(request);
......@@ -352,14 +352,14 @@ public class OrderController {
/**
* 创建预支付
*/
@ApiAnnotation(logMessage = "createPrepay")
@LogIgnore(logMessage = "createPrepay")
@PostMapping("/createPrepay")
public BaseResponse createPrepay(@Validated @LogParams @RequestBody CreatePrepayVo request) {
return orderAdapterService.createPrepay(request);
}
@ApiOperation(value = "创建积分订单", notes = "创建积分订单", produces = "application/json")
@ApiAnnotation(logMessage = "createIntegralOrder")
@LogIgnore(logMessage = "createIntegralOrder")
@PostMapping("/createIntegralOrder")
public BaseResponse createIntegralOrder(@Validated @LogParams @RequestBody IntegralOrderVo request) {
return orderservice.createIntegralOrder(request);
......@@ -368,7 +368,7 @@ public class OrderController {
/**
* 查询用户积分订单列表
*/
@ApiAnnotation(logMessage = "queryOrderByConditions")
@LogIgnore(logMessage = "queryOrderByConditions")
@PostMapping("/queryOrderByConditions")
public BaseResponse queryOrderByConditions(@Validated @LogParams @RequestBody QueryOrderByConditionsRequestVo queryOrderByConditionsRequestVo) {
return orderservice.queryOrderByConditions(queryOrderByConditionsRequestVo);
......@@ -377,7 +377,7 @@ public class OrderController {
/**
* 麦咖啡催单
*/
@ApiAnnotation(logMessage = "reminder")
@LogIgnore(logMessage = "reminder")
@PostMapping("/reminder")
public BaseResponse reminder(@Validated @LogParams @RequestBody ReminderVo reminderVo) {
return orderservice.reminder(reminderVo);
......@@ -386,7 +386,7 @@ public class OrderController {
/**
* 麦咖啡根据订单号查询骑手位置
*/
@ApiAnnotation(logMessage = "listFreeRider")
@LogIgnore(logMessage = "listFreeRider")
@PostMapping("/listFreeRider")
public BaseResponse listFreeRider(@Validated @LogParams @RequestBody FreeRiderPositionVo vo) {
return orderservice.listFreeRider(vo);
......@@ -395,7 +395,7 @@ public class OrderController {
/**
* 根据订单号查询订单状态和取餐码
*/
@ApiAnnotation(logMessage = "mcCafePollingPickUpCode")
@LogIgnore(logMessage = "mcCafePollingPickUpCode")
@PostMapping("/mcCafePollingPickUpCode")
public BaseResponse mcCafePollingPickUpCode(@Validated @LogParams @RequestBody MaCafeQueryOrderVo vo) {
return orderservice.mcCafePollingPickUpCode(vo);
......@@ -406,7 +406,7 @@ public class OrderController {
* @param timeOutOrderVo
* @return
*/
@ApiAnnotation(logMessage = "timeOutOrderRefund")
@LogIgnore(logMessage = "timeOutOrderRefund")
@PostMapping("/timeOutOrderRefund")
public BaseResponse timeOutOrderRefund(@Validated @LogParams @RequestBody TimeOutOrderVo timeOutOrderVo){
return orderservice.timeOutOrderRefund(timeOutOrderVo);
......@@ -416,7 +416,7 @@ public class OrderController {
* @param requestVo
* @return
*/
@ApiAnnotation(logMessage = "queryOrderRider")
@LogIgnore(logMessage = "queryOrderRider")
@PostMapping("/queryOrderRider")
public BaseResponse queryOrderRider(@Validated @LogParams @RequestBody OrderRiderRequestVo requestVo){
return orderservice.queryOrderRider(requestVo);
......@@ -426,7 +426,7 @@ public class OrderController {
/**
* 统计商户当日订单数
*/
@ApiAnnotation(logMessage = "queryTodayOrders")
@LogIgnore(logMessage = "queryTodayOrders")
@PostMapping("/queryTodayOrders")
public BaseResponse queryTodayOrders(@Validated @LogParams @RequestBody QueryOrderByConditionsRequestVo queryOrderByConditionsRequestVo) {
return orderservice.queryTodayOrders(queryOrderByConditionsRequestVo);
......@@ -435,7 +435,7 @@ public class OrderController {
/**
* 订单确认收货
*/
@ApiAnnotation(logMessage = "receive")
@LogIgnore(logMessage = "receive")
@PostMapping("/receive")
public BaseResponse orderReceive(@Validated @LogParams @RequestBody OrderReceiveRequestVO request) {
return mallOrderService.orderReceive(request);
......@@ -444,7 +444,7 @@ public class OrderController {
/**
* 退货快递信息
*/
@ApiAnnotation(logMessage = "refundExpress")
@LogIgnore(logMessage = "refundExpress")
@PostMapping("/refundExpress")
public BaseResponse refundExpress(@Validated @LogParams @RequestBody EditAfterSalesExpressVo editAfterSalesExpressVo) {
return mallOrderService.saveAfterSalesExpress(editAfterSalesExpressVo);
......@@ -453,7 +453,7 @@ public class OrderController {
/**
* 拼团失败批量退款
*/
@ApiAnnotation(logMessage = "spellGroupBatchRefund")
@LogIgnore(logMessage = "spellGroupBatchRefund")
@PostMapping("/spellGroupFailRefund")
public BaseResponse spellGroupFailRefund(@Validated @LogParams @RequestBody SpellGroupFailRefundVo refundVo) {
return orderservice.spellGroupOrderFailRefund(refundVo);
......@@ -462,7 +462,7 @@ public class OrderController {
/**
* 积分兑换记录查询（农工商）
*/
@ApiAnnotation(logMessage = "scoreRecord")
@LogIgnore(logMessage = "scoreRecord")
@PostMapping("/scoreRecord")
public BaseResponse scoreRecord(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
return orderservice.scoreRecord(queryOrderVo);
......@@ -476,7 +476,7 @@ public class OrderController {
* @param
* @return
*/
@ApiAnnotation(logMessage = "reportSendOrderCount")
@LogIgnore(logMessage = "reportSendOrderCount")
@GetMapping("/reportSendOrderCount")
public BaseResponse reportSendOrderCount() throws Exception {
LogUtil.info("触发订单上报",null,null);
......@@ -491,7 +491,7 @@ public class OrderController {
/**
* TLS定时器 每天凌晨 上报昨天 门店支付记录 到 门店服务去
*/
@ApiAnnotation(logMessage = "sendYesterDayStoreMsg")
@LogIgnore(logMessage = "sendYesterDayStoreMsg")
@GetMapping("/sendYesterDayStoreMsg")
public BaseResponse sendYesterDayStoreMsg() {
orderReportJobHandler.sendYesterDayStoreMsg();
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.MCCafeDeliveryBaseResponse;
import cn.freemud.entities.dto.delivery.*;
import cn.freemud.entities.dto.delivery.QueryDeliveryAmountRequestDto;
......@@ -14,27 +16,35 @@ import org.springframework.web.bind.annotation.RequestBody;
public interface DeliveryFeiginClient {
@PostMapping("/deliveryLogisticsAmount/queryDeliveryAmount")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
QueryDeliveryAmountResponseDto queryDeliveryAmount(@RequestBody QueryDeliveryAmountRequestDto request);
@PostMapping("/delivery/orderRemind")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
QueryDeliveryAmountResponseDto orderRemind(@RequestBody OrderRemindRequestDto request);
@PostMapping("/delivery/listFreeRider")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
MCCafeDeliveryBaseResponse<ResRiderTrackDto> listFreeRider(@RequestBody QueryLocusRiderTrackDto request);
@PostMapping("/delivery/create")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
CreateDeliveryOrderResponseDto deliveryOrderAdd(@RequestBody CreateDeliveryVo request);
@PostMapping("/delivery/getDeliveryStatusAndRiderPosition")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> getDeliveryStatusAndRiderPosition(@RequestBody QueryDeliveryBaseRequest queryDeliveryBaseRequest);
@PostMapping("/delivery/getThirdDeliveryFlag")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
DeliveryBaseResponse<GetDeliveryFlagResponseDto> getThirdDeliveryFlag(@RequestBody GetDeliveryFlagRequest getDeliveryFlagRequest);
@PostMapping("/delivery/queryDeliveryTemplate")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
QueryDeliveryTemplateResponse queryDeliveryTemplate(@RequestBody QueryDeliveryTemplateRequest queryDeliveryTemplateRequest);
@PostMapping("/delivery/isFreightRefundSupported")
@LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
QueryFreightRefundSupportedResponse isFreightRefundSupported(@RequestBody QueryFreightRefundSupportedVo queryDeliveryTemplateVo);
......
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