Skip to content

O
order-group
Commit 81097277 by 李学兴
Options

opt@20210702-日志规范-lxx:#日志规范 购物车 日志格式调整

parent fda01825
Showing with 268 additions and 178 deletions
assortment-ordercenter-sdk/pom.xml
......@@ -38,12 +38,11 @@
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId>
<version>1.3.63.RELEASE</version>
<!-- <version>1.3.63.RELEASE</version>-->
</dependency>
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>sdk-common-base</artifactId>
<version>1.5.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
package com.freemud.sdk.api.assortment.order.adapter;
import com.freemud.application.sdk.api.log.ApiLog;
import com.google.common.collect.Lists;
import cn.freemud.base.constant.Version;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
......@@ -32,9 +29,9 @@ import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
import com.freemud.sdk.api.assortment.order.util.ClassUtils;
import com.freemud.sdk.api.assortment.order.util.WeightUtils;
import com.mysql.cj.util.LogUtils;
import ma.glasnost.orika.MapperFacade;
import ma.glasnost.orika.impl.DefaultMapperFactory;
import org.apache.commons.collections4.CollectionUtils;
......@@ -530,7 +527,7 @@ public class OrderSdkAdapter {
private Long convertCreateOrderCost(Long originalAmount, List<OrderSettlementCreateReq> orderSettlementCreateReqList, List<OrderCostCreateReq> orderCostCreateReqs, List<CreateOrderAccountRequest> accounts) {
if (!CollectionUtils.isEmpty(accounts)) {
ApiLog.info("fisherman 构建order_cost_detail数据",accounts,JSON.toJSONString(accounts));
AssortOrderLogUtil.info("fisherman 构建order_cost_detail数据",accounts,JSON.toJSONString(accounts));
for (CreateOrderAccountRequest accountRequest : accounts) {
//老订单服务 1=配送费;3=包装费
if (QueryOrderAccountType.DELIVERY_AMOUNT.equals(accountRequest.getAccountType())
......@@ -3641,7 +3638,7 @@ public class OrderSdkAdapter {
|| account.getAccountType().equals(QueryOrderAccountType.DISCOUNT_COUPON)
|| account.getAccountType().equals(QueryOrderAccountType.FREIGHT_COUPON)
).collect(Collectors.toList());
ApiLog.info("优惠券转换,用于锁券操作 orderbean : accounts", orderBean, accounts);
AssortOrderLogUtil.info("优惠券转换,用于锁券操作 orderbean : accounts", orderBean, accounts);
if (CollectionUtils.isEmpty(couponList)) {
return null;
}
......@@ -3723,7 +3720,7 @@ public class OrderSdkAdapter {
|| account.getAccountType().equals(QueryOrderAccountType.DISCOUNT_COUPON)
|| account.getAccountType().equals(QueryOrderAccountType.FREIGHT_COUPON)
).collect(Collectors.toList());
ApiLog.info("优惠券转换,用于锁券操作 orderbean : accounts", orderBean, accounts);
AssortOrderLogUtil.info("优惠券转换,用于锁券操作 orderbean : accounts", orderBean, accounts);
if (CollectionUtils.isEmpty(couponList)) {
return null;
}
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
......@@ -7,14 +7,12 @@ import cn.freemud.amqp.MQService;
import cn.freemud.base.util.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.api.assortment.datamanager.order.config.ManagerOrderBeanConfig;
import com.freemud.api.assortment.datamanager.order.manager.AssortmentOrderManager;
import com.freemud.api.assortment.datamanager.order.vo.DMOrderItemVo;
import com.freemud.application.sdk.api.base.BaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.request.CouponLockRequest;
import com.freemud.application.sdk.api.couponcenter.offline.request.CouponRequest;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponLockResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
......@@ -72,9 +70,9 @@ import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse.DataBean.OrderBean;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
import com.freemud.sdk.api.assortment.order.vo.AssortmentOrderProductVo;
import com.google.gson.Gson;
import com.mysql.cj.util.LogUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......@@ -82,7 +80,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.freemud.application.sdk.api.membercenter.constant.InterfaceAddressConstant.MEMBER_EXTEND_INFO;
......@@ -130,7 +127,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Override
public CreateOrderResponse createOrderFlow(CreateOrderRequest config) {
com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = orderSdkAdapter.convent2NEWCreateOrderRequest(config.getBaseCreateOrderRequest());
ApiLog.info("fisherman 请求基础服务,最终构建 04",config,null);
AssortOrderLogUtil.info("fisherman 请求基础服务,最终构建 04",config!=null?JSON.toJSONString(config):null);
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> order = orderSdkService.createOrder(request, config.getTrackingNo());
CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(order);
if (!RESPONSE_SUCCESS.equals(createOrderResponse.getErrcode())
......@@ -1297,7 +1294,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if (StringUtils.isEmpty(oid)) {
return;
}
ApiLog.info("backOrdersStatusChange", oid, String.valueOf(status));
AssortOrderLogUtil.info("backOrdersStatusChange", oid, String.valueOf(status));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid);
requestDto.setOrderStatus(status);
......@@ -1835,14 +1832,14 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
}
if (null == pageResponse || !Objects.equals(RESPONSE_SUCCESS_STR, pageResponse.getCode())) {
ApiLog.info("查询ES服务商户门店退款订单数量ERR", pageResponse.getCode(), pageResponse.getMessage());
AssortOrderLogUtil.info("查询ES服务商户门店退款订单数量ERR", pageResponse.getCode(), pageResponse.getMessage());
queryPartnerRefundCountResponse.setErrcode(pageResponse.getCode());
queryPartnerRefundCountResponse.setErrmsg(pageResponse.getMessage());
return queryPartnerRefundCountResponse;
}
List<Map<String,Long>> storeCountList = new ArrayList<>();
if(CollectionUtils.isEmpty(pageResponse.getResult())){
ApiLog.info("未查询到ES服务商户门店退款订单数量", "", "");
AssortOrderLogUtil.info("未查询到ES服务商户门店退款订单数量");
queryPartnerRefundCountResponse.setErrcode(pageResponse.getCode());
queryPartnerRefundCountResponse.setErrmsg(pageResponse.getMessage());
return buildQueryPartnerRefundCountResponse(request,storeCountList);
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/util/AssortOrderLogUtil.java 0 → 100644
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: AssortOrderLogUtil
* @Package com.freemud.sdk.api.assortment.order.util
* @Description:
* @author: 布丁
* @date: 2021/7/3 12:01
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package com.freemud.sdk.api.assortment.order.util;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
public class AssortOrderLogUtil {
public static void info(String message) {
info(message, null);
}
public static void info(String message, Object param1) {
info(message, param1, null);
}
public static void info(String message, Object param1, Object param2) {
info(message, param1, param2, null);
}
public static void info(String message, Object param1, Object param2, Object param3) {
String p1 = "", p2 = "", p3 = "";
if (param1 != null) {
p1 = param1 instanceof String ? (String) param1 : JSON.toJSONString(param1);
}
if (param2 != null) {
p2 = param2 instanceof String ? (String) param2 : JSON.toJSONString(param2);
}
if (param3 != null) {
p3 = param3 instanceof String ? (String) param3 : JSON.toJSONString(param3);
}
ApiLog.printLog(message, p1, p2, p3);
}
}
assortment-shoppingcart-sdk/pom.xml
......@@ -52,7 +52,6 @@
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>sdk-common-base</artifactId>
<version>1.5.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java
package com.freemud.sdk.api.assortment.shoppingcart.adapter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ProductAttributeValueType;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateSkuProductType;
import com.freemud.sdk.api.assortment.shoppingcart.constant.*;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.constant.ProductStatus;
import com.freemud.sdk.api.assortment.shoppingcart.constant.ProductType;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoodsStates;
import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
import lombok.extern.slf4j.Slf4j;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......@@ -81,7 +79,7 @@ public class ShoppingCartAdapter {
productType.setMemberDiscount(cartGoods.getMemberDiscount());
validateShopProductRequest.getProductTypeList().add(productType);
}
ApiLog.info("替换购物车数据检验结果 01 -->", validateShopProductRequest, JSON.toJSON(checkCartRequest.getCartGoodsList()));
ShoppingSdkLogUtil.infoLog("替换购物车数据检验结果 01 --> validateShopProductRequest:{} cartGoodsList:{}", validateShopProductRequest, JSON.toJSON(checkCartRequest.getCartGoodsList()));
return validateShopProductRequest;
}
......@@ -359,7 +357,7 @@ public class ShoppingCartAdapter {
this.checkMaterialProduct(cartGoods, spuProduct);
} catch (Exception ex) {
ErrorLog.infoConvertJson(this.getClass(), "updateCartGoodsInfoNew_Error", ex);
ShoppingSdkLogUtil.errorLog( "updateCartGoodsInfoNew_Error cartGoods:{}", ex,cartGoods);
cartGoods.setCartGoodsUid(null);
}
}
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java
......@@ -39,6 +39,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.DateTimeUtils;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
......@@ -196,7 +197,7 @@ public interface ShoppingCartBaseService {
}
return CartResponseUtil.success(productInfosDTOBaseResponse.getData().getProducts());
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", getProductInfoRequest.getTrackingNo(), e.getMessage(), "getProductsInfo", getProductInfoRequest, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", getProductInfoRequest.getTrackingNo(), e.getMessage(), "getProductsInfo", getProductInfoRequest, e, Level.ERROR);
return null;
}
}
......@@ -208,7 +209,7 @@ public interface ShoppingCartBaseService {
try {
ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProduct(validateShopProductRequest);
ApiLog.info("替换购物车数据检验结果 1 -->", validateShopProductRequest,valiadResponse);
ShoppingSdkLogUtil.infoLog("替换购物车数据检验结果 1 --> validateShopProductRequest:{} valiadResponse:{}", validateShopProductRequest,valiadResponse);
if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
checkCartRequest.getCartGoodsList().clear();
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
......@@ -258,10 +259,10 @@ public interface ShoppingCartBaseService {
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_MATERIAL_ERROR);
}
ApiLog.info("替换购物车数据检验结果 2 -->", null,checkCartRequest);
ShoppingSdkLogUtil.infoLog("替换购物车数据检验结果 2 --> checkCartRequest:{}", checkCartRequest);
return CartResponseUtil.success(checkCartRequest);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
return CartResponseUtil.error(e.getMessage(),checkCartRequest);
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageCartBaseServiceImpl.java
......@@ -15,6 +15,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto;
import com.freemud.sdk.api.assortment.shoppingcart.exception.ServiceException;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.BoundHashOperations;
import org.springframework.data.redis.core.RedisTemplate;
......@@ -111,7 +112,7 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
// 如果拼单基础信息也过期了，直接返回不做操作
expire = redisTemplate.boundHashOps(genCollageBaseHashKey(cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getUserId())).getExpire();
if(expire < -1){
ApiLog.info("设置拼单购物车，拼单已经失效，param："+ JSONObject.toJSONString(cartParamDto));
ShoppingSdkLogUtil.infoLog("设置拼单购物车，拼单已经失效，param："+ JSONObject.toJSONString(cartParamDto));
return null;
}
}
......@@ -164,7 +165,7 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
CartGoods cartGoods = operations.get(cartParamDto.getCartGoodsUid());
return CartResponseUtil.success(cartGoods);
} catch (Exception e) {
ErrorLog.printErrorLog("collageCartBaseServiceImpl", trackingNo, e.getMessage(), "getCartGoods", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("collageCartBaseServiceImpl", trackingNo, e.getMessage(), "getCartGoods", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -427,7 +428,7 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
request.put("partnerId",partnerId);
request.put("storeId",storeId);
request.put("userId",userId);
ApiLog.info("增加购物车版本，拼单已经失效，param："+ JSONObject.toJSONString(request));
ShoppingSdkLogUtil.infoLog("增加购物车版本，拼单已经失效，param："+ JSONObject.toJSONString(request));
return null;
}
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/MealCartBaseServiceImpl.java
......@@ -18,6 +18,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.exception.ServiceException;
import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -293,7 +294,7 @@ public class MealCartBaseServiceImpl implements ShoppingCartBaseService {
redisCache.hashPut(hashKey, cartGoods.getCartGoodsUid(), cartGoods);
this.incrementCartVersion(cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getTableNumber());
} catch (Exception e) {
ErrorLog.printLog(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "添加购物车失败:" + e.getMessage(), e, Level.ERROR);
ShoppingSdkLogUtil.printLog(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "添加购物车失败:" + e.getMessage(), e, Level.ERROR);
return false;
}
return true;
......@@ -345,7 +346,7 @@ public class MealCartBaseServiceImpl implements ShoppingCartBaseService {
Method method = this.getClass().getMethod(operationType.getMethod(), CartParamDto.class);
method.invoke(this, cartParamDto);
} catch (Exception e) {
ErrorLog.printLog(SDKCommonBaseContextWare.getAppName(), trackingNo, getClass(), e.getMessage(), e, Level.ERROR);
ShoppingSdkLogUtil.printLog(SDKCommonBaseContextWare.getAppName(), trackingNo, getClass(), e.getMessage(), e, Level.ERROR);
e.printStackTrace();
return CartResponseUtil.error(e.getMessage());
}
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartBaseServiceImpl.java
......@@ -34,6 +34,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseServi
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.DateTimeUtils;
import com.freemud.sdk.api.assortment.shoppingcart.util.PropertyConvertUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......@@ -90,7 +91,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
List<CartAddItem> itemList = redisCache.hashGet(redisKey, cartParamDto.getStoreId());
return CartResponseUtil.success(itemList);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "detailCart", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "detailCart", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -105,7 +106,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
cartGoodsList.sort(Comparator.comparingLong(CartGoods::getCreateTimeMili));
return CartResponseUtil.success(cartGoodsList);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -120,7 +121,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
cartGoodsList.sort(Comparator.comparingLong(CartGoods::getCreateTimeMili));
return CartResponseUtil.success(cartGoodsList);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -133,7 +134,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
String couponCode = operations.get();
return CartResponseUtil.success(couponCode);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartCouponCode", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartCouponCode", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -152,7 +153,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
operations.expire(expire, TimeUnit.DAYS);
return CartResponseUtil.success();
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -170,7 +171,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
operations.expire(expire, timeUnit);
return CartResponseUtil.success();
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -189,7 +190,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
operations.expire(expire, timeUnit);
return CartResponseUtil.success();
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -207,7 +208,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
operations.expire(expire, timeUnit);
return CartResponseUtil.success();
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartSendGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartSendGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -223,7 +224,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
operations.expire(expire, TimeUnit.DAYS);
return CartResponseUtil.success();
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartCouponCode", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartCouponCode", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -236,7 +237,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
CartGoods cartGoods = operations.get(cartParamDto.getCartGoodsUid());
return CartResponseUtil.success(cartGoods);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoods", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoods", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -258,7 +259,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
}
return this.getCartGoodsList(cartParamDto, trackingNo);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "updateGoodsQty", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "updateGoodsQty", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -270,7 +271,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
redisTemplate.delete(this.getShoppingCartGoodsAmountKey(cartParamDto));
return new BaseResponse(VersionUtils.VER_1, CartResponseConstant.SUCCESS.getCode(), CartResponseConstant.SUCCESS.getMessage());
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -287,7 +288,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
redisTemplate.delete(this.getShoppingCartCouponCodeKey(cartParamDto));
return new BaseResponse(VersionUtils.VER_1, CartResponseConstant.SUCCESS.getCode(), CartResponseConstant.SUCCESS.getMessage());
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -298,7 +299,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
redisTemplate.delete(this.getShoppingCartSendGoodsKey(cartParamDto));
return new BaseResponse(VersionUtils.VER_1, CartResponseConstant.SUCCESS.getCode(), CartResponseConstant.SUCCESS.getMessage());
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -311,7 +312,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
redisTemplate.delete(this.getShoppingCartCouponCodeKey(cartParamDto));
return new BaseResponse(VersionUtils.VER_1, CartResponseConstant.SUCCESS.getCode(), CartResponseConstant.SUCCESS.getMessage());
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clearMoneyCoupon", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clearMoneyCoupon", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -518,7 +519,7 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
return result;
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCouponOrderWay", null, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCouponOrderWay", null, e, Level.ERROR);
return null;
}
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartMallBaseServiceImpl.java
......@@ -12,6 +12,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -64,7 +65,7 @@ public class ShoppingCartMallBaseServiceImpl implements ShoppingCartBaseService
cartGoodsList.sort(Comparator.comparingLong(CartGoods::getCreateTimeMili));
return CartResponseUtil.success(cartGoodsList);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -84,7 +85,7 @@ public class ShoppingCartMallBaseServiceImpl implements ShoppingCartBaseService
operations.expire(expire, TimeUnit.DAYS);
return this.getCartGoodsList(cartParamDto, trackingNo);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setCartGoodsList", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -97,7 +98,7 @@ public class ShoppingCartMallBaseServiceImpl implements ShoppingCartBaseService
CartGoods cartGoods = operations.get(cartParamDto.getCartGoodsUid());
return CartResponseUtil.success(cartGoods);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoods", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getCartGoods", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -121,7 +122,7 @@ public class ShoppingCartMallBaseServiceImpl implements ShoppingCartBaseService
}
return this.getCartGoodsList(cartParamDto, trackingNo);
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "updateGoodsQty", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "updateGoodsQty", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -133,7 +134,7 @@ public class ShoppingCartMallBaseServiceImpl implements ShoppingCartBaseService
redisTemplate.delete(this.getShoppingCartGoodsAmountKey(cartParamDto));
return new BaseResponse(VersionUtils.VER_1, CartResponseConstant.SUCCESS.getCode(), CartResponseConstant.SUCCESS.getMessage());
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clear", cartParamDto, e, Level.ERROR);
return null;
}
}
......@@ -157,7 +158,7 @@ public class ShoppingCartMallBaseServiceImpl implements ShoppingCartBaseService
String mallShopId = (String) operations.get();
return mallShopId;
} catch (Exception e) {
ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getBindMallShopId", appId, e, Level.ERROR);
ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getBindMallShopId", appId, e, Level.ERROR);
return null;
}
}
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/util/ErrorLog.java deleted 100644 → 0
package com.freemud.sdk.api.assortment.shoppingcart.util;
import ch.qos.logback.classic.Level;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: ${FILE_NAME}
* @Package com.freemud.base.log
* @Description: 异常日志打印
* @author: aiqi.gong
* @date: 2017/6/21 10:43
* @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
public class ErrorLog {
private static Logger logger = LoggerFactory.getLogger(com.freemud.application.sdk.api.log.ErrorLog.class);
public static void infoConvertJson(String appName, String trackingNo, Class logClass, String message, Exception ex) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ex.printStackTrace(new PrintStream(baos));
String exception = baos.toString();
printLog(appName, trackingNo, logClass, message, exception, Level.INFO);
}
public static void errorConvertJson(String appName, String trackingNo, Class logClass, String message, Exception ex) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ex.printStackTrace(new PrintStream(baos));
String exception = baos.toString();
printLog(appName, trackingNo, logClass, message, exception, Level.ERROR);
}
public static void printLog(String appName, String trackingNo, Class logClass, String message, Exception ex, Level level) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ex.printStackTrace(new PrintStream(baos));
String exception = baos.toString();
printLog(appName, trackingNo, logClass, message, exception, level);
}
public static void printLog(String appName, String trackingNo, Class logClass, String message, Object object, Level level) {
logger.info("appName:{} trackingNo:{} className{} level:{} messasge:{} stackTrack:{}", appName, trackingNo, logClass, level.levelStr, message, JSONObject.toJSONString(object));
}
public static void printErrorLog(String appName, String trackingNo, String message, String url, Object request, Exception ex, Level level) {
logger.info("appName:{} trackingNo:{} level:{} messasge:{} url:{} requestBody:{} stackTrack:{}", appName, trackingNo, level.levelStr, message, url, JSONObject.toJSONString(request), JSONObject.toJSONString(ex));
}
}
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/util/ShoppingSdkLogUtil.java 0 → 100644
package com.freemud.sdk.api.assortment.shoppingcart.util;
import ch.qos.logback.classic.Level;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.ApiLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.text.MessageFormat;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: ${FILE_NAME}
* @Package com.freemud.base.log
* @Description: 异常日志打印
* @author: aiqi.gong
* @date: 2017/6/21 10:43
* @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Component
public class ShoppingSdkLogUtil implements BeanFactoryAware {
private static Logger logger = LoggerFactory.getLogger(com.freemud.application.sdk.api.log.ErrorLog.class);
@Value("${print-debug-log:false}")
private boolean printDebug;
private static BeanFactory beanFactory;
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
ShoppingSdkLogUtil.beanFactory = beanFactory;
}
public void debug(String message, Object... params) {
if (logger.isDebugEnabled()) {
this.info(message, params);
}
}
public void info(String message, Object... params) {
if (printDebug) {
Object[] clone = params != null ? params.clone() : new String[]{};
String param1 = "", param2 = "", param3 = "";
if (params.length > 0) {
param1 = clone[0] instanceof String ? (String) clone[0] : JSON.toJSONString(clone[0]);
}
if (params.length > 1) {
param2 = clone[1] instanceof String ? (String) clone[1] : JSON.toJSONString(clone[1]);
}
if (params.length > 2) {
param3 = clone[2] instanceof String ? (String) clone[2] : JSON.toJSONString(clone[2]);
}
try {
ApiLog.printLog(MessageFormat.format(message, params), param1, param2, param3);
} catch (Exception e) {
com.freemud.application.sdk.api.log.ErrorLog.errorDev("LogUtil.printLog ".concat(message), e, params);
}
}
}
public void error(String message, Exception e, Object... params) {
com.freemud.application.sdk.api.log.ErrorLog.errorDev(message, e, params);
}
public void errorSe(String message, Exception e, Object... params) {
com.freemud.application.sdk.api.log.ErrorLog.errorSe(message, e, params);
}
private static ShoppingSdkLogUtil getLogUtil() {
return beanFactory.getBean("shoppingSdkLogUtil", ShoppingSdkLogUtil.class);
}
public static void debugLog(String message, Object... params) {
if (logger.isDebugEnabled()) {
getLogUtil().debug(message, params);
}
}
public static void infoLog(String message, Object... params) {
getLogUtil().info(message,params);
}
public static void errorLog(String message,Exception e, Object... params) {
getLogUtil().error(message,e,params);
}
public static void infoConvertJson(String appName, String trackingNo, Class logClass, String message, Exception ex) {
if (ex==null){
getLogUtil().info(message);
}else {
getLogUtil().error(message,ex);
}
}
public static void errorConvertJson(String appName, String trackingNo, Class logClass, String message, Exception ex) {
getLogUtil().error(message,ex);
}
public static void printLog(String appName, String trackingNo, Class logClass, String message, Exception ex, Level level) {
if (ex == null) {
getLogUtil().info(message);
} else {
getLogUtil().error(message, ex);
}
}
public static void printLog(String appName, String trackingNo, Class logClass, String message, Object object, Level level) {
getLogUtil().info("appName:{} trackingNo:{} className{} level:{} messasge:{} stackTrack:{}", appName, trackingNo, logClass, level.levelStr, message, JSONObject.toJSONString(object));
}
public static void printErrorLog(String appName, String trackingNo, String message, String url, Object request, Exception ex, Level level) {
getLogUtil().error("appName:{} trackingNo:{} level:{} messasge:{} url:{} requestBody:{} stackTrack:{}", ex,appName, trackingNo, level.levelStr, message, url, JSONObject.toJSONString(request), JSONObject.toJSONString(ex));
}
}
ordercenter-sdk/pom.xml
......@@ -8,7 +8,7 @@
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.3.63.RELEASE</version>
<!-- <version>1.3.63.RELEASE</version>-->
<artifactId>ordercenter-sdk</artifactId>
<dependencies>
......
pom.xml
......@@ -21,6 +21,8 @@
<sharding-jdbc.version>2.0.1</sharding-jdbc.version>
<lombok.version>1.16.16</lombok.version>
<feign-form.version>3.0.3</feign-form.version>
<ordercenter-sdk.version>1.0.0</ordercenter-sdk.version>
</properties>
<modules>
<module>ordercenter-sdk</module>
......@@ -112,7 +114,6 @@
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>sdk-common-base</artifactId>
<version>2.0.BETA</version>
<!-- <version>1.5.7-SNAPSHOT</version>-->
</dependency>
<!-- mybatis -->
......@@ -163,6 +164,11 @@
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId>
<version>${ordercenter-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
......@@ -40,7 +40,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageOrderBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -190,7 +190,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
} catch (Exception e) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "updateGoodsQty:" + e.getMessage(), e);
ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "updateGoodsQty:" + e.getMessage(), e);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_VERSION_ERROR, "购物车商品有变动，请手动刷新再修改");
}
......@@ -386,7 +386,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
} catch (Exception e) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl updateGoodsQty:" + e.getMessage(), e);
ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl updateGoodsQty:" + e.getMessage(), e);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_VERSION_ERROR, "购物车商品有变动，请手动刷新再修改");
}
......@@ -496,7 +496,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
}
} catch (Exception e) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getGoodsList:" + e.getMessage(), e);
ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getGoodsList:" + e.getMessage(), e);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_VERSION_ERROR, "购物车商品有变动，请手动刷新再修改");
}
......@@ -860,7 +860,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
// 调用老促销接口
activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
} catch (Exception ex) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getActivityCalculationDiscountResponse:" + ex.getMessage(), ex);
ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getActivityCalculationDiscountResponse:" + ex.getMessage(), ex);
throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
}
// 返回成功
......@@ -1071,7 +1071,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
String collageCartLockKey = collageCartBaseService.genCollageCarLockKey(partnerId, storeId, crateUserId);
RedisLock.getInstance(redisCache.getRedisTemplate()).unlock(collageCartLockKey);
} catch (Exception e) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "购物车版本解锁解锁失败" , e);
ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "购物车版本解锁解锁失败" , e);
}
}
......@@ -1254,7 +1254,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
} catch (Exception e) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl updateGoodsQty:" + e.getMessage(), e);
ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl updateGoodsQty:" + e.getMessage(), e);
return ResponseUtil.error(ResponseResult.SHOPPING_CART_VERSION_ERROR, "购物车商品有变动，请手动刷新再修改");
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
......@@ -826,7 +826,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
// ApiLog.info("fisherman 新算价 校验入参券是否可用new ",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCodes());
if(ApplicationConstant.printDebug){
ApiLog.printLog("fisherman 新算价 校验入参券是否可用new ",JSON.toJSONString(shoppingCartGoodsResponseVo),JSON.toJSONString(shoppingCartInfoRequestVo.getCouponCodes()),null);
ApiLog.printLog("校验入参券是否可用",JSON.toJSONString(shoppingCartGoodsResponseVo),shoppingCartInfoRequestVo.getCouponCode(),null);
}
// 校验入参券是否可用
if (!checkAvailableCoupon(shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getCouponCode())){
......@@ -1494,6 +1494,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
}
try {
// ApiLog.debug("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto));
if(ApplicationConstant.printDebug){
ApiLog.printLog("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto),null,null);
}
activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
} catch (Exception ex) {
ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
......@@ -2479,7 +2483,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
// ApiLog.debug("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
if(ApplicationConstant.printDebug){
ApiLog.printLog("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(),JSON.toJSONString(storeDeliveryUseOld), "receiveId:"+receiveId+",partnerId:"+partnerId+",storeId:"+storeId);
ApiLog.printLog("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(),JSON.toJSONString(storeDeliveryUseOld),"receiveId:"+receiveId+",partnerId:"+partnerId+",storeId:"+storeId);
}
if (storeDeliveryUseOld) {
deliveryAmount = Long.parseLong(getDeliveryAmount(receiveId, partnerId, storeId).toString());
......
shopping-cart-application-service/src/main/resources/logback.xml
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!--配置变量-->
<property resource="application.properties"/>
<property name="PROJECT_NAME" value="${spring.application.name}" />
<property name="LOG_HOME" value="/data/logs" />
<!-- %m输出的信息,%p日志级别,%t线程名,%d日期,%c类的全名,,,, -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>%d %p [%thread] (%file:%line\) - [${PROJECT_NAME:-}, ${eureka.instance.metadataMap.version} , %tid] %m%n </pattern>
</layout>
</encoder>
</appender>
<property name="PROJECT_NAME" value="${spring.application.name}"/>
<property name="LOG_HOME" value="/data/logs"/>
<!-- 设置日志输出格式，ConsoleAppender代表输出到控制台 -->
<appender name="STDOUT_SKYWALKING" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>{"timestamp":"%d", "level":"%p", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "message":%m}%n
<pattern>
{"level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}","grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}","message":%m}%n
</pattern>
</layout>
</encoder>
</appender>
<springProfile name="default">
<!--用来设置某一个环境/包的日志打印级别，以及指定appender，name: 用来指定受此logger约束的某一个包，level: 用来设置打印级别，addtivity: 是否向上级logger传递打印信息-->
<springProfile name="mock">
<logger name="cn.freemud" level="debug" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING" />
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
<logger name="com.freemud" level="debug" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING" />
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
<appender name="FREEMUD_DEV_DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/${PROJECT_NAME}/freemud_api_${PROJECT_NAME}-dev.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/${PROJECT_NAME}/freemud_api_${PROJECT_NAME}-dev-%d{yyyy-MM-dd}.log</fileNamePattern>
</rollingPolicy>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<charset>UTF-8</charset>
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>%d %p [%thread] (%file:%line\) - [${spring.application.name}, %tid] %m%n </pattern>
</layout>
</encoder>
</appender>
</springProfile>
<springProfile name="default">
<logger name="cn.freemud" level="debug" additivity="false">
<appender-ref ref="FREEMUD_DEV_DEBUG"/>
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
<logger name="com.freemud" level="debug" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
</springProfile>
<springProfile name="mock">
<springProfile name="dev">
<logger name="cn.freemud" level="debug" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING" />
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
<logger name="com.freemud" level="debug" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING" />
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
</springProfile>
<springProfile name="qa">
<logger name="cn.freemud" level="debug" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING" />
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
<logger name="com.freemud" level="debug" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING" />
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
</springProfile>
<springProfile name="dev">
<appender name="FREEMUD_TEST_DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/${PROJECT_NAME}/freemud_api_${PROJECT_NAME}-test.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/${PROJECT_NAME}/freemud_api-${PROJECT_NAME}-%d{yyyy-MM-dd}.log</fileNamePattern>
</rollingPolicy>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<charset>UTF-8</charset>
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern>%d %p [%thread] (%file:%line\) - [${spring.application.name}, %tid] %m%n </pattern>
</layout>
</encoder>
</appender>
<logger name="cn.freemud" level="debug" additivity="false">
<appender-ref ref="FREEMUD_TEST_DEBUG"/>
<springProfile name="pre-release">
<logger name="cn.freemud" level="info" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
<logger name="com.freemud" level="debug" additivity="false">
<appender-ref ref="FREEMUD_TEST_DEBUG"/>
<logger name="com.freemud" level="info" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
</springProfile>
......@@ -91,14 +67,12 @@
<logger name="cn.freemud" level="info" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
<logger name="com.freemud" level="info" additivity="false">
<appender-ref ref="STDOUT_SKYWALKING"/>
</logger>
</springProfile>
<!-- 从高到地低 OFF 、 FATAL 、 ERROR 、 WARN 、 INFO 、 DEBUG 、 TRACE 、 ALL，日志输出规则 根据当前ROOT 级别，日志输出时，级别高于root默认的级别时会自动输出 -->
<root level="info">
<appender-ref ref="STDOUT_SKYWALKING"/>
</root>
......
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