Skip to content

O
order-group
Commit 309b3935 by ping.wu
Options

Feign打印日志修改

parent e4011340
Showing with 230 additions and 139 deletions
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/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/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 org.springframework.cloud.openfeign.FeignClient;
......@@ -21,83 +22,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.constant.ResponseCodeConstant;
import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.ActivityCalculationDiscountRequestDto;
......@@ -37,18 +38,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);
......@@ -58,6 +62,7 @@ public interface PromotionDiscountClient {
* @param groupWorkQueryRequest
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/groupWork/query")
GroupWorkQueryResponse groupWorkQuery(GroupWorkQueryRequest groupWorkQueryRequest);
......@@ -67,6 +72,7 @@ public interface PromotionDiscountClient {
* @param groupWorkJoinRequest
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/activity/groupWork/join")
GroupWorkJoinResponse groupWorkJoin(GroupWorkJoinRequest groupWorkJoinRequest);
......@@ -75,6 +81,7 @@ public interface PromotionDiscountClient {
* @param querySpellGroupRequest
* @return
*/
@LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/activity/groupWork/queryByGroupId")
QuerySpellGroupVoResponse queryByGroupId(QuerySpellGroupRequest querySpellGroupRequest);
......@@ -83,6 +90,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);
}
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