Skip to content

O
order-group
Commit 0e17525c by 李学兴
Options

Merge branch '20210702-日志规范-lxx' into qa 

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
parents cabfba52 f894cc3c
Showing with 31 additions and 39 deletions
call-back-service/src/main/resources/logback.xml
......@@ -11,7 +11,7 @@
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>
{"level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}","grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}","message":%m}%n
{ "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "printMessage":"%m","messageData":[%X{messageData}]}%n
</pattern>
</layout>
</encoder>
......@@ -78,10 +78,3 @@
</root>
</configuration>
\ No newline at end of file
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
package cn.freemud.manager;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.enums.OrderType;
import cn.freemud.enums.OrderTackCodeRuleEnum;
import cn.freemud.redis.RedisCache;
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;
......@@ -11,7 +11,6 @@ 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;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -39,6 +39,11 @@ import cn.freemud.entities.dto.ecology.SendMessageRequest;
//import cn.freemud.entities.dto.ecology.SendMessageResponse;
//import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
//import cn.freemud.entities.dto.ecology.SendMessageRequest;
import cn.freemud.entities.dto.delivery.*;
import cn.freemud.entities.dto.ecology.SendMessageRequest;
import cn.freemud.entities.dto.ecology.SendMessageResponse;
import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
import cn.freemud.entities.dto.ecology.SendMessageRequest;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.order.FacePayRequestDto;
......
order-application-service/src/main/resources/logback.xml
......@@ -11,7 +11,7 @@
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>
{"level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}","grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}","message":%m}%n
{ "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "printMessage":"%m","messageData":[%X{messageData}]}%n
</pattern>
</layout>
</encoder>
......@@ -78,10 +78,3 @@
</root>
</configuration>
\ No newline at end of file
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
......@@ -39,7 +39,7 @@ public class ShoppingCartCollageController {
* 向拼单购物车中添加商品
*/
@PostMapping(value = "/addGoods")
@LogIgnore(logMessage = "addGoods")
@ApiAnnotation(logMessage = "addGoods")
public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).addGoods(request);
}
......@@ -47,7 +47,7 @@ public class ShoppingCartCollageController {
/**
* 修改拼单购物车中商品数量
*/
@LogIgnore(logMessage = "updateGoodsQty")
@ApiAnnotation(logMessage = "updateGoodsQty")
@PostMapping(value = "/updateGoodsQty")
public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).updateGoodsQty(request);
......@@ -56,7 +56,7 @@ public class ShoppingCartCollageController {
/**
* 查询购物车信息
*/
@LogIgnore(logMessage = "listCartGoods")
@ApiAnnotation(logMessage = "listCartGoods")
@PostMapping(value = "/listCartGoods")
public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).getGoodsList(request);
......@@ -65,7 +65,7 @@ public class ShoppingCartCollageController {
/**
* 清空自己的购物车
*/
@LogIgnore(logMessage = "clearPartCartGoods")
@ApiAnnotation(logMessage = "clearPartCartGoods")
@PostMapping(value = "/clearPartCartGoods")
public BaseResponse clearPartCartGoods(@Validated @LogParams @RequestBody ShoppingCartCollageClearRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).clearPartCarGoods(request);
......@@ -74,7 +74,7 @@ public class ShoppingCartCollageController {
/**
* 清空购物车
*/
@LogIgnore(logMessage = "clearCartGoods")
@ApiAnnotation(logMessage = "clearCartGoods")
@PostMapping(value = "/clearCartGoods")
public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).clear(request);
......@@ -86,7 +86,7 @@ public class ShoppingCartCollageController {
* @param getShoppingCartGoodsApportionRequestVo
* @return
*/
@LogIgnore(logMessage = "getShoppingCartGoodsApportion")
@ApiAnnotation(logMessage = "getShoppingCartGoodsApportion")
@PostMapping(value = "/getShoppingCartGoodsApportion")
public BaseResponse getShoppingCartGoodsApportion(@Validated @LogParams @RequestBody GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo) {
if (getShoppingCartGoodsApportionRequestVo == null || getShoppingCartGoodsApportionRequestVo.getShoppingCartInfoRequestVo() == null) {
......@@ -110,7 +110,7 @@ public class ShoppingCartCollageController {
* 查询购车信息无配送费
* SVC卡支付check，check购物车金额加配送费小于储值卡金额
*/
@LogIgnore(logMessage = "listCartGoodsCheck")
@ApiAnnotation(logMessage = "listCartGoodsCheck")
@PostMapping(value = "/listCartGoodsCheck")
public BaseResponse listCartGoodsCheck(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).getGoodsListCheck(request);
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
......@@ -77,7 +77,7 @@ public class ShoppingCartController {
* 从微信卡券向购物车中添加商品
*/
@PostMapping(value = "/addGoodsByCard")
@LogIgnore(logMessage = "addGoodsByCard")
@ApiAnnotation(logMessage = "addGoodsByCard")
public BaseResponse addGoodsByCard(@Validated @LogParams @RequestBody AddGoodsByWeixinCardRequestVo request) {
return getInstanceByRequest(request).addGoodsByCard(request);
}
......@@ -87,7 +87,7 @@ public class ShoppingCartController {
*/
@IsConvertEN
@PostMapping(value = "/addGoods")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "addGoods")
@ApiAnnotation(logMessage = "addGoods")
public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
ShoppingCartNewService instanceByRequest = getInstanceByRequest(request);
if (instanceByRequest instanceof ShoppingCartNewServiceImpl && SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
......@@ -103,7 +103,7 @@ public class ShoppingCartController {
*/
@IsConvertEN
@PostMapping(value = "/updateGoodsQty")
@LogIgnore(logMessage = "updateGoodsQty")
@ApiAnnotation(logMessage = "updateGoodsQty")
public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
ShoppingCartNewService instanceByRequest = getInstanceByRequest(request);
if (instanceByRequest instanceof ShoppingCartNewServiceImpl && SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
......@@ -119,7 +119,7 @@ public class ShoppingCartController {
*/
@IsConvertEN
@PostMapping(value = "/listCartGoods")
@LogIgnore(logMessage = "listCartGoods")
@ApiAnnotation(logMessage = "listCartGoods")
public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
// 代金券 & 折扣券互斥校验
BaseResponse baseResponse = verifyCouponCodes(request.getCouponCodes());
......@@ -140,7 +140,7 @@ public class ShoppingCartController {
* SVC卡支付check，check购物车金额加配送费小于储值卡金额
*/
@PostMapping(value = "/listCartGoodsCheck")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "listCartGoodsCheck")
@ApiAnnotation(logMessage = "listCartGoodsCheck")
public BaseResponse listCartGoodsCheck(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
// 代金券 & 折扣券互斥校验
BaseResponse baseResponse = verifyCouponCodes(request.getCouponCodes());
......@@ -163,7 +163,7 @@ public class ShoppingCartController {
*/
@IsConvertEN
@PostMapping(value = "/clearCartGoods")
@LogIgnore(logMessage = "clearCartGoods")
@ApiAnnotation(logMessage = "clearCartGoods")
public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
String sessionId = request.getSessionId();
if (StringUtils.isEmpty(sessionId)) {
......@@ -184,7 +184,7 @@ public class ShoppingCartController {
*/
@IsConvertEN
@PostMapping(value = "/getShoppingCartGoodsApportion")
@LogIgnore(logMessage = "getShoppingCartGoodsApportion")
@ApiAnnotation(logMessage = "getShoppingCartGoodsApportion")
public BaseResponse getShoppingCartGoodsApportion(@Validated @LogParams @RequestBody GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo) {
if (getShoppingCartGoodsApportionRequestVo == null || getShoppingCartGoodsApportionRequestVo.getShoppingCartInfoRequestVo() == null) {
return ResponseUtil.error(ResponseResult.NOT_LOGIN);
......@@ -240,7 +240,7 @@ public class ShoppingCartController {
* 线下订单查询接口
*/
@PostMapping(value = "/getMemberInfo")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getMemberInfo")
@ApiAnnotation(logMessage = "/getMemberInfo")
public BaseResponse getMemberInfo(@LogParams @RequestBody GetMemberInfoRequestDto request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).getMemberInfo(request);
}
......@@ -249,7 +249,7 @@ public class ShoppingCartController {
* 结算页获取是否展示订单那备注配置
*/
@PostMapping(value = "/getOpenStoreIappWxappConfig")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getOpenStoreIappWxappConfig")
@ApiAnnotation(logMessage = "/getOpenStoreIappWxappConfig")
public BaseResponse getOpenStoreIappWxappConfig(@LogParams @RequestBody OpenStoreIappWxappConfigRequestVo request) {
return openStoreIappWxappConfigService.getOpenStoreIappWxappConfig(request);
}
......@@ -258,7 +258,7 @@ public class ShoppingCartController {
* 结算页获取加价购活动商品列表
*/
@PostMapping(value = "/premiumExchange")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/premiumExchange")
@ApiAnnotation(logMessage = "/premiumExchange")
public BaseResponse premiumExchange(@LogParams @RequestBody @Validated PremiumExchangeRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).premiumExchange(request);
}
......@@ -266,7 +266,7 @@ public class ShoppingCartController {
* 券码查询购物车商品信息(平台结算页可用券列表用)
*/
@PostMapping(value = "/getCartInfoByUser")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getCartInfoByUser")
@ApiAnnotation(logMessage = "/getCartInfoByUser")
public BaseResponse getCartInfoByUser(@LogParams @RequestBody @Validated CouponAvailableRequestVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).getCartInfoByUser(request);
}
......@@ -276,7 +276,7 @@ public class ShoppingCartController {
* 替换老门店的商品到切换的门店下
*/
@PostMapping(value = "/replaceGoodsByShop")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/replaceGoodsByShop")
@ApiAnnotation(logMessage = "/replaceGoodsByShop")
public BaseResponse replaceGoodsByShop(@LogParams @RequestBody @Validated ShopGoodsReplaceVo request) {
return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).replaceGoodsByShop(request);
}
......@@ -290,7 +290,7 @@ public class ShoppingCartController {
* 测试用，后续删除
*/
@PostMapping(value = "/test/putCache")
@LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/putCache")
@ApiAnnotation(logMessage = "/putCache")
public BaseResponse putCache(@LogParams @RequestBody @Validated PutCacheVo request) {
com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto();
......
shopping-cart-application-service/src/main/resources/logback.xml
......@@ -11,7 +11,7 @@
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>
{"level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}","grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}","message":%m}%n
{ "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "printMessage":"%m","messageData":[%X{messageData}]}%n
</pattern>
</layout>
</encoder>
......
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