Skip to content

O
order-group
Commit cf67257d by ping.wu
Options

g购物车打印日志去除

parent 893a4c97
Showing with 42 additions and 237 deletions
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java
......@@ -265,7 +265,6 @@ public class ShoppingCartAdapter {
* @param productBeans 购物车中所有的productId对应的商品详情
*/
public void updateCartGoodsInfoNew(CartGoods cartGoods, List<ProductBeanDTO> productBeans) {
// log.info("【updateCartGoodsInfoNew】： cartGoods: {}, productBeans: {} ,trackingNo:{}", JSONObject.toJSONString(cartGoods), JSONObject.toJSONString(productBeans), LogThreadLocal.getTrackingNo());
try {
Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
if (!firstProduct.isPresent()) {
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java
......@@ -13,7 +13,6 @@ import com.freemud.application.sdk.api.couponcenter.online.request.PartnerReques
import com.freemud.application.sdk.api.couponcenter.online.response.CouponDetailResponse;
import com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService;
import com.freemud.application.sdk.api.couponcenter.online.service.OnlineCouponSdkService;
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;
......@@ -210,9 +209,6 @@ public interface ShoppingCartBaseService {
try {
ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProduct(validateShopProductRequest);
// ShoppingSdkLogUtil.infoLog("替换购物车数据检验结果 1 --> validateShopProductRequest:{} valiadResponse:{}", validateShopProductRequest,valiadResponse);
ApiLog.printLog("addGoods validateShopProductRequest ---> validateShopProductRequest:{} valiadResponse:{}", JSONObject.toJSONString(validateShopProductRequest),JSON.toJSONString(valiadResponse),null);
if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
checkCartRequest.getCartGoodsList().clear();
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageCartBaseServiceImpl.java
......@@ -4,7 +4,6 @@ import ch.qos.logback.classic.Level;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.redis.RedisCache;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.RedisKeyConstant;
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/MealCartBaseServiceImpl.java
......@@ -5,8 +5,7 @@ import cn.freemud.base.entity.BaseResponse;
import cn.freemud.redis.RedisCache;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
//import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.MealClearOperationEnum;
......@@ -287,16 +286,11 @@ public class MealCartBaseServiceImpl implements ShoppingCartBaseService {
if (CollectionUtils.isEmpty(cartGoodsList)) {
return true;
}
try {
CartGoods cartGoods = cartGoodsList.get(0);
addUserCarts(sessionId, cartGoods.getCartGoodsUid(), cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getTableNumber());
String hashKey = genMealCartBaseHashKey(cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getTableNumber());
redisCache.hashPut(hashKey, cartGoods.getCartGoodsUid(), cartGoods);
this.incrementCartVersion(cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getTableNumber());
} catch (Exception e) {
ShoppingSdkLogUtil.printLog(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "添加购物车失败:" + e.getMessage(), e, Level.ERROR);
return false;
}
CartGoods cartGoods = cartGoodsList.get(0);
addUserCarts(sessionId, cartGoods.getCartGoodsUid(), cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getTableNumber());
String hashKey = genMealCartBaseHashKey(cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getTableNumber());
redisCache.hashPut(hashKey, cartGoods.getCartGoodsUid(), cartGoods);
this.incrementCartVersion(cartParamDto.getPartnerId(), cartParamDto.getStoreId(), cartParamDto.getTableNumber());
return true;
}
......@@ -347,7 +341,6 @@ public class MealCartBaseServiceImpl implements ShoppingCartBaseService {
method.invoke(this, cartParamDto);
} catch (Exception e) {
ShoppingSdkLogUtil.printLog(SDKCommonBaseContextWare.getAppName(), trackingNo, getClass(), e.getMessage(), e, Level.ERROR);
e.printStackTrace();
return CartResponseUtil.error(e.getMessage());
}
return CartResponseUtil.success();
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartBaseServiceImpl.java
......@@ -13,7 +13,6 @@ import com.freemud.application.sdk.api.couponcenter.online.request.PartnerReques
import com.freemud.application.sdk.api.couponcenter.online.response.CouponDetailResponse;
import com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService;
import com.freemud.application.sdk.api.couponcenter.online.service.OnlineCouponSdkService;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.productcenter.constant.ResponseConstant;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.application.sdk.api.productcenter.domain.ProductInfosDTO;
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/util/ShoppingSdkLogUtil.java
......@@ -109,6 +109,10 @@ public class ShoppingSdkLogUtil implements BeanFactoryAware {
}
}
public static void printLog( String message, String param1, String param2) {
getLogUtil().info(message,param1,param2);
}
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));
}
......
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
......@@ -23,10 +23,12 @@ import cn.freemud.enums.GoodsTypeEnum;
import cn.freemud.enums.ProductType;
import cn.freemud.utils.BeanUtil;
import cn.freemud.utils.ExceptionUtils;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
......@@ -40,7 +42,6 @@ import java.util.stream.Collectors;
import java.util.stream.LongStream;
@Component
@Slf4j
public class ShoppingCartConvertAdapter {
private static final String ATTRIBUTEID = "attributeId";
......@@ -1074,7 +1075,7 @@ public class ShoppingCartConvertAdapter {
// todo 设置加料
this.checkMaterialProductForMCoffee(cartGoods, spuProduct);
} catch (Exception ex) {
log.error("updateCartGoodsInfoForMCoffee_Error {} ", ExceptionUtils.getExceptionInfo(ex));
ShoppingSdkLogUtil.errorLog("updateCartGoodsInfoForMCoffee_Error {}",ex, JSON.toJSONString(cartGoods));
cartGoods.setCartGoodsUid(null);
}
}
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/ControllerLogAop.java
......@@ -72,9 +72,6 @@ public class ControllerLogAop implements Ordered {
Object target = joinPoint.getTarget();
Method currentMethod = target.getClass().getMethod(msig.getName(), msig.getParameterTypes());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
/*if (ApiLog.isDebugEnabled()) {
ApiLog.debug("获取tracking的值====>{}", new Object[]{request.getHeader("x-transaction-id")});
}*/
LogThreadLocal.setTrackingNo(StringUtils.isEmpty(request.getHeader("x-transaction-id")) ? UUID.randomUUID().toString().replaceAll("-", "") : request.getHeader("x-transaction-id"));
List logArgs = this.getLogArgs(currentMethod, joinPoint);
String requestData = JSON.toJSONString(logArgs);
......@@ -95,7 +92,6 @@ public class ControllerLogAop implements Ordered {
}
}
}
//ApiLog.infoConvertJson(logMethod.toString(), logIgnore.logMessage(), request, startTime, System.currentTimeMillis(), requestData, logObj);
LogThreadLocal.removeTrackingNo();
return object;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
......@@ -8,15 +8,15 @@ import cn.freemud.inteceptor.CommonServiceException;
import cn.freemud.redis.RedisCache;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformConfig;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformConfigManager;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
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.log.ThirdPartyLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.aspectj.lang.ProceedingJoinPoint;
......@@ -84,7 +84,7 @@ public class WebAspect {
private static final String APP_CHANNEL = "3";
private static Logger logger = LoggerFactory.getLogger(ApiLog.class);
private static Logger logger = LoggerFactory.getLogger(ShoppingSdkLogUtil.class);
/**
* 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link IgnoreFeignLogAnnotation}配置，输出响应报文里面所有的信息
......@@ -249,7 +249,7 @@ public class WebAspect {
}
} catch (Exception e) {
log.error("WebAspect Feign Log Ignore error {}", ExceptionUtils.getMessage(e));
ShoppingSdkLogUtil.errorLog("WebAspect Feign Log Ignore error {}",e, null);
}
return result;
}
......@@ -301,7 +301,7 @@ public class WebAspect {
* <p>
* }
* } catch (Exception e) {
* log.error("WebAspect Feign Log Ignore error {}", ExceptionUtils.getMessage(e));
*
* }
* return result;
* }
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
......@@ -13,9 +13,7 @@
package cn.freemud.controller;
import cn.freemud.annotations.IsConvertEN;
import cn.freemud.annotations.LogIgnore;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.demo.controller.ShoppingCartDemoController;
import cn.freemud.entities.dto.GetMemberInfoRequestDto;
import cn.freemud.entities.vo.*;
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/service/CalculationSharingAdapter.java
......@@ -16,7 +16,6 @@ import cn.freemud.enums.ActivityChannelEnum;
import cn.freemud.enums.CreateOrderType;
import cn.freemud.enums.GoodsTypeEnum;
import cn.freemud.utils.PropertyConvertUtil;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import org.apache.commons.collections4.CollectionUtils;
......@@ -249,7 +248,6 @@ public class CalculationSharingAdapter {
private List<GetCalculationDiscountBO.CalculationDiscountCoupon> buildCoupons(List<GetCalculationDiscountBO.CalculationDiscountCoupon> oldCoupons, List<CouponCode> coupons){
//ApiLog.info("批量使用优惠券前，oldCoupons,coupons",oldCoupons,coupons);
for(int i = 0 ; i < oldCoupons.size() ; i++){
GetCalculationDiscountBO.CalculationDiscountCoupon oldCoupon = oldCoupons.get(i);
oldCoupon.setUseIndex(i);
......@@ -273,7 +271,6 @@ public class CalculationSharingAdapter {
}
}
//ApiLog.info("批量使用优惠券后，oldCoupons,coupons",oldCoupons,coupons);
return oldCoupons;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/promotion/KgdPromotionServiceImpl.java
......@@ -17,9 +17,8 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.ActivityService;
import cn.freemud.service.thirdparty.CalculationClient;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import lombok.extern.slf4j.Slf4j;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -45,8 +44,6 @@ public class KgdPromotionServiceImpl implements PromotionService{
CalculationSharingDiscountRequestDto shareDiscountRequestDto = promotionBO2DTOAdapter.convert2CalculationSharingDiscountRequestDto(getCalculationDiscountBO);
CalculationSharingDiscountResponseDto calculationSharingDiscountResponseDto = null;
try {
//ApiLog.debug("start sharing discount dto={}", JSON.toJSONString(shareDiscountRequestDto));
ApiLog.printLog("start sharing discount dto={}",JSON.toJSONString(shareDiscountRequestDto),null,null);
calculationSharingDiscountResponseDto = calculationClient.calculationSharingDiscount(shareDiscountRequestDto);
}
catch (Exception e) {
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformApportionService.java
......@@ -2,7 +2,6 @@ package cn.freemud.demo.service.impl;
import cn.freemud.adapter.CouponAdapter;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.constant.ApplicationConstant;
import cn.freemud.demo.entities.bo.SendGoods;
import cn.freemud.demo.entities.bo.goods.*;
import cn.freemud.demo.entities.bo.promotion.GetCalculationDiscountBO;
......@@ -19,16 +18,15 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.CouponService;
import cn.freemud.utils.PropertyConvertUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.*;
......@@ -247,16 +245,11 @@ public class PlatformApportionService extends AbstractApportionService {
private List<GetCalculationDiscountBO.CalculationDiscountCoupon> buildCoupons(List<GetCalculationDiscountBO.CalculationDiscountCoupon> oldCoupons, List<ShoppingCartGoodsApportionBO.couponCode> coupons){
//ApiLog.info("批量使用优惠券前，oldCoupons,coupons",oldCoupons,coupons);
ApiLog.printLog("批量使用优惠券前，oldCoupons,coupons", JSON.toJSONString(oldCoupons),JSON.toJSONString(coupons),null);
for(int i = 0 ; i < oldCoupons.size() ; i++){
GetCalculationDiscountBO.CalculationDiscountCoupon oldCoupon = oldCoupons.get(i);
oldCoupon.setUseIndex(i);
}
List<String> codes = oldCoupons.stream().map(GetCalculationDiscountBO.CalculationDiscountCoupon::getCode).collect(toList());
if (coupons != null) {
......@@ -273,9 +266,6 @@ public class PlatformApportionService extends AbstractApportionService {
oldCoupons.add(coupon);
}
}
//ApiLog.info("批量使用优惠券后，oldCoupons,coupons",oldCoupons,coupons);
return oldCoupons;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformListCartGoodsService.java
......@@ -29,7 +29,6 @@ import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.CouponService;
import cn.freemud.utils.PropertyConvertUtil;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
......
shopping-cart-application-service/src/main/java/cn/freemud/factory/AbstractShoppingCartImpl.java
......@@ -29,7 +29,6 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
......@@ -214,7 +213,6 @@ public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService
if (StringUtils.isBlank(receiveId)) {
return deliveryAmount;
}
//ApiLog.debug("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
if (storeDeliveryUseOld) {
deliveryAmount = Long.parseLong(getDeliveryAmount(receiveId, partnerId, storeId).toString());
shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);
......
shopping-cart-application-service/src/main/java/cn/freemud/hystrix/ShortMessageClientFallbackFactory.java
......@@ -27,7 +27,6 @@
// return new ShortMessageClient(){
// @Override
// public SendSmsCodeResponseDto sendSmsCode(String msappid, SendShortMessageCodeDto sendShortMessageCodeDto) {
// log.info("******************************启用熔断机制factory");
// SendSmsCodeResponseDto sendSmsCodeResponseDto=new SendSmsCodeResponseDto();
// sendSmsCodeResponseDto.setMsg("调用子服务异常，触发熔断机制");
// sendSmsCodeResponseDto.setIssuccess(false);
......
shopping-cart-application-service/src/main/java/cn/freemud/interceptor/BizExceptionHandler.java
......@@ -67,7 +67,6 @@ public class BizExceptionHandler {
// @ExceptionHandler(Throwable.class)
// @ResponseStatus(HttpStatus.OK)
// public BaseResponse bindException(Throwable e) {
// log.error("系统内部异常", e);
// return ResponseUtil.error(ResponseResult.SYSTEM_ERROR);
// }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/CommonService.java
......@@ -3,8 +3,7 @@ package cn.freemud.service;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.utils.SpringBeanUtil;
import com.freemud.application.sdk.api.base.BaseResponse;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
//import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/GradDeliveryServiceImpl.java
......@@ -23,7 +23,6 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.delivery.DeliveryService;
import cn.freemud.service.store.StoreBaseApiClient;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
......@@ -142,7 +141,6 @@ public class GradDeliveryServiceImpl extends AbstractDeliveryServiceImpl impleme
request.setPartnerId(partnerId);
request.setStoreCode(storeCode);
StoreCBaseResponse<StoreCBaseResponseDto> responseDto = storeBaseApiClient.queryDeliverDetail(request);
//ApiLog.info("fisherman 获取门店预计送达时间",request,responseDto);
if (responseDto == null) {
throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR);
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
......@@ -12,15 +12,11 @@ import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.thirdparty.StoreItemClient;
import cn.freemud.service.thirdparty.StoreItemClient;
import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.constant.ResponseResultEnum;
import com.freemud.application.sdk.api.log.ApiLog;
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.log.LogThreadLocal;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
......@@ -30,6 +26,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.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
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.factory.annotation.Autowired;
......@@ -82,7 +79,6 @@ public class AssortmentSdkService {
cartParamDto.setUserId(userId);
BaseResponse<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods> baseResponse = shoppingCartService.getCartGoods(cartParamDto, LogThreadLocal.getTrackingNo());
if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || baseResponse.getResult() == null) {
ApiLog.printLog("getCartGoods:", SDKCommonBaseContextWare.getAppName(),LogThreadLocal.getTrackingNo(),JSONObject.toJSONString(baseResponse));
return null;
}
......@@ -322,8 +318,6 @@ public class AssortmentSdkService {
ProductInfosDto productInfosDto = storeItemClient.listProductInfos(getProductInfoDto);
if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(productInfosDto.getErrcode()) || CollectionUtils.isEmpty(productInfosDto.getData().getProducts())) {
// ApiLog.info("查询商品信息失败，getProductInfoDto，baseResponse",getProductInfoDto,productInfosDto);
ApiLog.printLog("查询商品信息失败，getProductInfoDto，baseResponse",JSON.toJSONString(getProductInfoDto),JSON.toJSONString(productInfosDto),null);
return null;
}
return productInfosDto.getData().getProducts();
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AsyOperationServiceImpl.java
......@@ -21,7 +21,6 @@ import cn.freemud.comm.druid.MyMapper;
import cn.freemud.entities.db.SaasLinkMonitorLog;
import cn.freemud.entities.vo.ThirdPartLogVo;
import cn.freemud.service.AsyOperationService;
import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.ErrorLog;
import lombok.Getter;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuriedPointServiceImpl.java
......@@ -21,9 +21,7 @@ import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIa
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIappWxappConfigManager;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
import com.freemud.application.sdk.api.log.ApiLog;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -155,7 +153,6 @@ public class BuriedPointServiceImpl implements BuriedPointService {
// syncTxProductClient.BuriedPoint(dto);
// }
// } catch (Exception e) {
// log.error("购物车添加埋点报错，让交易继续下去..", e);
// }
// return null;
// }
......@@ -244,12 +241,10 @@ public class BuriedPointServiceImpl implements BuriedPointService {
// optRequestDto.setActionList(actionListStr);
// String strOptRequestDto = new Gson().toJson(optRequestDto);
// dto.setOpt2(strOptRequestDto);
// log.info("syncTxProductClient.BuriedPoint_BuriedPointPaymentbofore**" + dto);
// String str = syncTxProductClient.BuriedPoint(dto);
// LogUtil.info("syncTxProductClient.BuriedPoint_BuriedPointPayment after", dto, str);
// }
// } catch (Exception e) {
// log.info("支付之后埋点报错，让交易继续下去" + e);
// }
// return null;
// }
......@@ -337,12 +332,10 @@ public class BuriedPointServiceImpl implements BuriedPointService {
// optRequestDto.setActionList(actionListStr);
// String strOptRequestDto = new Gson().toJson(optRequestDto);
// dto.setOpt2(strOptRequestDto);
// log.info("buriedPoint:" + dto);
// String str = syncTxProductClient.BuriedPoint(dto);
// LogUtil.info("buriedPoint after", dto, str);
// }
// } catch (Exception e) {
// log.info("埋点报错，让交易继续下去" + e);
// }
// return null;
// }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
......@@ -17,7 +17,6 @@ import cn.freemud.adapter.CouponAdapter;
import cn.freemud.adapter.StoreAdapter;
import cn.freemud.adapter.StoreItemAdapter;
import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.ApplicationConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.demo.manager.coupon.Finals;
import cn.freemud.entities.dto.*;
......@@ -35,12 +34,9 @@ import cn.freemud.service.ItemService;
import cn.freemud.service.UserService;
import cn.freemud.service.thirdparty.*;
import cn.freemud.utils.BarcodeUtil;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.PropertyConvertUtil;
import cn.freemud.utils.RedisUtil;
import com.alibaba.fastjson.JSON;
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.productcenter.constant.ResponseConstant;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
......@@ -50,6 +46,7 @@ import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopPr
import com.freemud.application.sdk.api.util.SignUtil;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
......@@ -141,9 +138,7 @@ public class CouponServiceImpl implements CouponService {
* @return
*/
// @Override
// public BaseResponse<GetMemberCouponListResponseVo> getCouponList(GetMemberCouponListRequestVo getMemberCouponListRequestVo) {
// log.info("getMemberCouponListRequestVo" + gson.toJson(getMemberCouponListRequestVo));
// UserLoginInfoDto userLoginInfoDto = userService.getUserLoginInfoBySessionId(getMemberCouponListRequestVo.getSessionId());
// public BaseResponse<GetMemberCouponListResponseVo> getCouponList(GetMemberCouponListRequestVo getMemberCouponListRequestVo) {// UserLoginInfoDto userLoginInfoDto = userService.getUserLoginInfoBySessionId(getMemberCouponListRequestVo.getSessionId());
//
// List<Integer> statusFlags = getMemberCouponListRequestVo.getStatusFlags();
// if (CollectionUtils.isNotEmpty(statusFlags) && statusFlags.size() == 1 && statusFlags.contains(0)) {
......@@ -297,7 +292,6 @@ public class CouponServiceImpl implements CouponService {
// @Override
// public GetCouponDetailResponseDto getMCCafeMemberCoupon(GetMemberCouponRequestVo requestVo) {
// log.info("getMemberCoupon:" + gson.toJson(requestVo));
// //TODO 券详情查券服务
// Map<String, String> map = new TreeMap<String, String>();
// if (StringUtils.isBlank(requestVo.getPartnerId()) || StringUtils.isBlank(requestVo.getCouponCode())) {
......@@ -766,8 +760,6 @@ public class CouponServiceImpl implements CouponService {
@Override
public CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto) {
// ApiLog.debug("checkSpqInfo****" + gson.toJson(requestDto));
ApiLog.printLog("checkSpqInfo****",gson.toJson(requestDto),null,null);
String partnerId = requestDto.getPartnerId();
String couponCode = requestDto.getCouponCode();
String storeId = requestDto.getStoreId();
......@@ -841,8 +833,6 @@ public class CouponServiceImpl implements CouponService {
dto.setSkuName(StringUtils.isNotBlank(productsVo.getSkuName()) ? productsVo.getSkuName() : productsVo.getSpuName());
dto.setPicture(productsVo.getSpuPicture());
dto.setCouponType(0);
// ApiLog.debug("dto***" + dto);
ApiLog.printLog("dto***", JSON.toJSONString(dto),null,null);
return dto;
}
......@@ -924,7 +914,6 @@ public class CouponServiceImpl implements CouponService {
*/
@Override
public CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto, String goodsId) {
// ApiLog.debug("checkSpqInfo****" + gson.toJson(requestDto));
String partnerId = requestDto.getPartnerId();
String couponCode = requestDto.getCouponCode();
String storeId = requestDto.getStoreId();
......@@ -934,7 +923,6 @@ public class CouponServiceImpl implements CouponService {
requestVo.setCouponCode(couponCode);
requestVo.setStoreId(requestDto.getStoreId());
GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
ApiLog.printLog("couponService.getMemberCoupon", gson.toJson(requestVo), gson.toJson(couponDetailResponseDto),"");
if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
return null;
}
......@@ -1170,9 +1158,7 @@ public class CouponServiceImpl implements CouponService {
// getCouponVo.setMemberId(userId);
// getCouponVo.setAppSecret(getAppSecret(couponPartnerId));
// getCouponVo.setCoupons(coupons);
// log.info("CouponServiceImpl getCoupons start:{}", JSON.toJSONString(getCouponVo));
// GetCodeRespVo getCodeRespVo = getCouponService.getCoupons(getCouponVo);
// log.info("CouponServiceImpl getCoupons end:{}", JSON.toJSONString(getCodeRespVo));
// Map<String, ActivityResponseDto> activityResponseDtoMap = activityQueryResponseDto.getResult().stream().collect(
// Collectors.toMap(ActivityResponseDto::getActivityCode, a -> a, (k1, k2) -> k1));
// if (Objects.equals(String.valueOf(getCodeRespVo.getResult()), ResponseResult.SUCCESS.getCode()) && CollectionUtils.isNotEmpty(getCodeRespVo.getCodeList())) {
......@@ -1312,10 +1298,8 @@ public class CouponServiceImpl implements CouponService {
// }
// // 书写逻辑
// couponAvailableReqVo.setCouponCodes(calCouponCodes);
// ApiLog.debug("availableCoupon couponAvailableService.getCouponsAvailable num:{};start:{}", j, JSON.toJSONString(couponAvailableReqVo));
// //CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
// CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo);
// ApiLog.debug("availableCoupon couponAvailableService.getCouponsAvailable num:{};end:{}", j, JSON.toJSONString(couponsAvailable));
// if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
// && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {
// couponStateList.addAll(couponsAvailable.getCouponStateList());
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CustomerScoreService.java
......@@ -13,7 +13,6 @@ import cn.freemud.entities.vo.*;
import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.service.IPromotionService;
import cn.freemud.service.thirdparty.CustomScoreClient;
import cn.freemud.utils.LogUtil;
import com.freemud.application.sdk.api.constant.FMStatusCode;
import com.freemud.application.sdk.api.log.ErrorLog;
import org.apache.commons.collections4.CollectionUtils;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ItemServiceImpl.java
......@@ -30,7 +30,7 @@ import cn.freemud.service.thirdparty.StockClient;
import cn.freemud.service.thirdparty.StoreItemClient;
import cn.freemud.utils.ResponseUtil;
import cn.freemud.utils.Sha1Util;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
......@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
@Service
public class ItemServiceImpl implements ItemService {
private Logger log = LoggerFactory.getLogger(ApiLog.class);
private Logger log = LoggerFactory.getLogger(ShoppingSdkLogUtil.class);
private final Integer RESPONSE_SUCCESS_CODE = 100;
private static Gson gson = new Gson();
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/MaterialPromotionService.java
......@@ -11,10 +11,8 @@ import cn.freemud.entities.vo.*;
import cn.freemud.enums.GoodsTypeEnum;
import cn.freemud.service.IPromotionService;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.Data;
import lombok.extern.log4j.Log4j;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -85,11 +83,7 @@ public class MaterialPromotionService implements IPromotionService {
@Override
public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
HashMap<String, MaterialApportion> map = getApportionGoodsDetail(calculationDiscountResult);
// ApiLog.debug("updateShoppingCartGoodsApportion->map:" + map);
ApiLog.printLog("updateShoppingCartGoodsApportion->map:", JSON.toJSONString(map),null,null);
List<ShoppingCartGoodsDto.CartGoodsDetailDto> products = shoppingCartGoodsDto.getProducts();
// ApiLog.debug("updateShoppingCartGoodsApportion->product:" + products);
ApiLog.printLog("updateShoppingCartGoodsApportion->product:", JSON.toJSONString(products),null,null);
if (map.size() > 0) {
String pk = "";
for (ShoppingCartGoodsDto.CartGoodsDetailDto product : products) {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/OpenStoreIappWxappConfigServiceImpl.java
......@@ -17,7 +17,6 @@ import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/RecommendServiceImpl.java
......@@ -109,7 +109,6 @@ public class RecommendServiceImpl implements RecommendService {
// redisCache.save(redisTxKey, reTxMap, 1L, TimeUnit.HOURS);
// return responseDto;
// } catch (Exception e) {
// log.info("猜你喜欢获取推荐商品接口异常" + e);
// return new RecommendProductResponseDto();
// }
// }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
......@@ -26,7 +26,6 @@ import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
......@@ -240,8 +239,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
.build();
List<CollageMemberState> collageMemberState = collageOrderBaseService.getCollageMemberState(collageOrderDto).getResult();
if(collageMemberState == null || collageMemberState.isEmpty()){
// ApiLog.info("splitByUser 参单人员为空，partnerId:{}，storeId：{}，createUserId:{}，currentUserId：{}",partnerId,storeId,createUserId,currentUserId);
ApiLog.printLog("splitByUser 参单人员为空，partnerId:{}，storeId：{}，createUserId:{}，currentUserId：{}"+partnerId,storeId,createUserId,currentUserId);
ShoppingSdkLogUtil.printLog("splitByUser 参单人员为空，partnerId:{}，storeId：{}，createUserId:{}，currentUserId：{}"+partnerId,storeId,createUserId,currentUserId);
return null;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
......@@ -49,7 +49,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
......@@ -57,6 +56,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
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.service.impl.ShoppingCartMallBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
......@@ -930,17 +930,11 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
private List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> buildCoupons(List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> oldCoupons, List<ShoppingCartInfoRequestVo.couponCode> coupons){
// ApiLog.info("批量使用优惠券前，oldCoupons,coupons",oldCoupons,coupons);
ApiLog.printLog("批量使用优惠券前，oldCoupons,coupons", JSON.toJSONString(oldCoupons),JSON.toJSONString(coupons),null);
for(int i = 0 ; i < oldCoupons.size() ; i++){
CalculationSharingDiscountRequestDto.CalculationDiscountCoupon oldCoupon = oldCoupons.get(i);
oldCoupon.setUseIndex(i);
}
List<String> codes = oldCoupons.stream().map(CalculationSharingDiscountRequestDto.CalculationDiscountCoupon::getCode).collect(toList());
if (coupons != null) {
......@@ -958,9 +952,6 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
}
}
// ApiLog.info("批量使用优惠券后，oldCoupons,coupons",oldCoupons,coupons);
ApiLog.printLog("批量使用优惠券后，oldCoupons,coupons", JSON.toJSONString(oldCoupons),JSON.toJSONString(coupons),null);
return oldCoupons;
}
......@@ -970,7 +961,6 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
if (StringUtils.isBlank(province)) {
return deliveryAmount;
}
ApiLog.printLog("获取配送配逻辑 ", LogThreadLocal.getTrackingNo(), partnerId,province);
Long orderAmount = 0L ;
Integer orderCount = 0;
if(null != cartGoodsList && cartGoodsList.size()>0){
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
......@@ -32,9 +32,9 @@ import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.api.assortment.datamanager.meal.dto.MealNumberDto;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ErrorLog;
//import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
//import com.freemud.card.sdk.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.MealClearOperationEnum;
......@@ -575,7 +575,6 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
try {
activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
} catch (Exception ex) {
// com.freemud.application.sdk.api.log.ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
ErrorLog.errorDev("500", "calculation_discount_error", ex, activityCalculationDiscountRequestDto);
throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
......@@ -60,7 +60,6 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
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.membercenter.request.QueryReceiveAddressRequest;
......@@ -83,6 +82,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
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.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import javafx.util.Pair;
import ma.glasnost.orika.MapperFacade;
......@@ -714,7 +714,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
, sendGoods
, deliveryAmount
, null);
// ApiLog.info("fisherman 新算价 配送费字段数据 01 ",calculationSharingDiscountResult,shoppingCartGoodsResponseVo);
sharingCartService.distribute(calculationSharingDiscountResult
, cartGoodsList
, shoppingCartGoodsResponseVo
......@@ -729,7 +728,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
,shoppingCartInfoRequestVo.getFlag()
, userId
, storeId);
// ApiLog.info("fisherman 新算价 配送费字段数据 02 ",null,shoppingCartGoodsResponseVo);shoppingCartGoodsResponseVo
buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,calculationSharingDiscountResult,shoppingCartInfoRequestVo.getFlag(),partnerId);
}
else {
......@@ -812,8 +810,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
// 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
// ApiLog.info("fisherman 新算价 校验入参券是否可用new ",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCodes());
ApiLog.printLog("校验入参券是否可用",JSON.toJSONString(shoppingCartGoodsResponseVo),shoppingCartInfoRequestVo.getCouponCode(),null);
// 校验入参券是否可用
if (!checkAvailableCoupon(shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getCouponCode())){
return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_NOT_USE);
......@@ -2456,7 +2452,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (StringUtils.isBlank(receiveId) && !Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
return deliveryAmount;
}
// 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());
shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);
......@@ -2804,17 +2799,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
private List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> buildCoupons(List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> oldCoupons,
List<ShoppingCartInfoRequestVo.couponCode> coupons){
// ApiLog.info("批量使用优惠券前，oldCoupons,coupons",oldCoupons,coupons);
ApiLog.printLog("批量使用优惠券前，oldCoupons,coupons", JSON.toJSONString(oldCoupons),JSON.toJSONString(coupons),null);
for(int i = 0 ; i < oldCoupons.size() ; i++){
CalculationSharingDiscountRequestDto.CalculationDiscountCoupon oldCoupon = oldCoupons.get(i);
oldCoupon.setUseIndex(i);
}
List<String> codes = oldCoupons.stream().map(CalculationSharingDiscountRequestDto.CalculationDiscountCoupon::getCode).collect(toList());
if (coupons != null) {
......@@ -2832,9 +2821,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
}
// ApiLog.info("批量使用优惠券后，oldCoupons,coupons",oldCoupons,coupons);
ApiLog.printLog("批量使用优惠券后，oldCoupons,coupons", JSON.toJSONString(oldCoupons),JSON.toJSONString(coupons),null);
return oldCoupons;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/StoreServiceImpl.java
......@@ -10,11 +10,10 @@ import cn.freemud.entities.vo.*;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.manager.*;
//import cn.freemud.service.thirdparty.StoreClient;
import cn.freemud.service.thirdparty.DeliveryFeiginClient;
import cn.freemud.utils.*;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import org.apache.commons.collections4.CollectionUtils;
......@@ -34,8 +33,6 @@ import java.util.*;
@Service
public class StoreServiceImpl {
private Logger log = LoggerFactory.getLogger(StoreServiceImpl.class);
private final Integer RESPONSE_SUCCESS_CODE = 100;
private static Gson gson = new Gson();
......@@ -64,9 +61,6 @@ public class StoreServiceImpl {
String businessHourStr = businessHoursDay.replace("-", ",").replace("_", ",");
String[] businessHours = businessHourStr.split(",");
if (businessHours.length != 2) {
ApiLog.printLog("checkStoreOpen businessHoursDay is invaild , businessHoursDay：{}", businessHoursDay,null,null);
// ErrorLog.errorConvertJson(this.getClass(),"checkStoreOpen businessHoursDay is invaild , businessHoursDay：{}", businessHoursDay, "");
// log.error("checkStoreOpen businessHoursDay is invaild , businessHoursDay：{}", businessHoursDay);
return false;
}
String startDateTimeStr = DateUtil.convert2String(new Date(), DateUtil.FORMAT_YMD) + " " + businessHours[0] + ":00";
......@@ -78,7 +72,6 @@ public class StoreServiceImpl {
endDateTime = hhmmss.parse(endDateTimeStr);
} catch (ParseException e) {
ErrorLog.errorConvertJson(this.getClass(),"checkStoreOpen businessHoursDay is invaild , businessHoursDay：{}" + businessHoursDay, e);
// log.error("checkStoreOpen businessHoursDay endDateTimeStr is invaild , endDateTimeStr：{}", endDateTimeStr);
return false;
}
Date nowDate = new Date();
......@@ -101,7 +94,6 @@ public class StoreServiceImpl {
// StoreBaseResponseDto<StoreImageListResponseDto> storeImages = storeClient.findStoreImages(storeImagesRequestDto);
// if (!RESPONSE_SUCCESS_CODE.equals(storeImages.getStatusCode()) || storeImages.getBizVO() == null
// || CollectionUtils.isEmpty(storeImages.getBizVO().getList())) {
// log.info("getStoreImages storeImages:{}", gson.toJson(storeImages));
// return Collections.emptyList();
// }
// List<StoreImgResponseDto> storeImgResponseDtos = storeImages.getBizVO().getList();
......@@ -115,7 +107,6 @@ public class StoreServiceImpl {
// }
// return images;
// } catch (Exception e) {
// log.error("findStoreImages is error !!!", e);
// return Collections.emptyList();
// }
// }
......@@ -136,8 +127,6 @@ public class StoreServiceImpl {
// throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
// }
// } catch (Exception e) {
// LogUtil.error("getStoreInfo 获取门店信息异常", gson.toJson(storeInfoRequestDto), gson.toJson(storeInfoRequestDto), e);
// log.error("getStoreInfo is error ,storeInfoRequestDto:{} !! ", storeInfoRequestDto, e);
// throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
// }
// StoreResponseDto storeResponseDto = response.getBizVO();
......@@ -145,7 +134,6 @@ public class StoreServiceImpl {
// String businessHourStr = storeResponseDto.getBusinessHoursDay().replace("-", ",").replace("_", ",");
// String[] businessHours = businessHourStr.split(",");
// if (businessHours.length != 2) {
// log.error("checkStoreOpen businessHoursDay is invaild , businessHoursDay：{}", storeResponseDto.getBusinessHoursDay());
// throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
// }
// String startDateTimeStr = DateUtil.convert2String(new Date(), DateUtil.FORMAT_YMD) + " " + businessHours[0] + ":00";
......@@ -156,7 +144,6 @@ public class StoreServiceImpl {
// try {
// endDateTime = hhmmss.parse(endDateTimeStr);
// } catch (ParseException e) {
// log.error("checkStoreOpen businessHoursDay endDateTimeStr is invaild , endDateTimeStr：{}", endDateTimeStr);
// throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
// }
// storeResponseDto.setBusinessHoursDayStartTime(startDateTime);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/TimeSalePromotionService.java
......@@ -8,8 +8,6 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.*;
import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.service.IPromotionService;
import com.freemud.application.sdk.api.log.ApiLog;
import lombok.extern.log4j.Log4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
......@@ -16,7 +16,7 @@ import cn.freemud.enums.*;
import cn.freemud.service.thirdparty.CustomerApplicationClient;
import cn.freemud.utils.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.Data;
import lombok.NoArgsConstructor;
import ma.glasnost.orika.MapperFacade;
......@@ -70,8 +70,6 @@ public class CalculationCommonService {
/**
* 使用促销算价赋值行记录
*/
// ApiLog.debug("initShoppingCart={},discountResult={}", JSON.toJSON(cartGoodsList),JSON.toJSON(discountResult));
ApiLog.printLog("initShoppingCart={},discountResult={}",JSON.toJSONString(cartGoodsList),JSON.toJSONString(discountResult),null);
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = null;
if (discountResult != null && CollectionUtils.isNotEmpty(discountResult.getGoods())) {
goods = discountResult.getGoods();
......@@ -221,8 +219,6 @@ public class CalculationCommonService {
public ShoppingCartGoodsDto.CartGoodsDetailDto convertCartGoods2DetailGoodsList(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods calculationGoods
, CartGoods cartGoods
, String partnerId) {
// ApiLog.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
ApiLog.printLog("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", JSON.toJSONString(calculationGoods), JSON.toJSONString(cartGoods),null);
ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.convertCartGoods2DetailGoods(calculationGoods, cartGoods,partnerId);
return cartGoodsDetailDto;
}
......@@ -236,8 +232,6 @@ public class CalculationCommonService {
*/
public ShoppingCartApportionBO.CartGoodsDetailDto convertCartGoods2NewDetailGoodsList(CalculationDiscountBO.CalculationDiscountResult.Goods calculationGoods
, CartGoods cartGoods, String partnerId) {
// ApiLog.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
ApiLog.printLog("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", JSON.toJSONString(calculationGoods), JSON.toJSONString(cartGoods),null);
CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods oldGoods = mapperFacade.map(calculationGoods, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.class);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
......@@ -24,11 +24,11 @@ import cn.freemud.service.impl.AssortmentSdkService;
import cn.freemud.service.thirdparty.CalculationClient;
import cn.freemud.utils.PropertyConvertUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
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.factory.annotation.Autowired;
......@@ -104,12 +104,8 @@ public class CalculationSharingDiscountService {
CheckSpqInfoResponseDto checkSpqInfo = null;
if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
// ApiLog.debug("coupon:{},{}", "hg", JSON.toJSONString(checkSpqInfo));
ApiLog.printLog("coupon:{},{}", "hg", JSON.toJSONString(checkSpqInfo),null);
} else {
checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
// ApiLog.debug("coupon:{},{}", "sp", JSON.toJSONString(checkSpqInfo));
ApiLog.printLog("coupon:{},{}", "sp", JSON.toJSONString(checkSpqInfo),null);
}
if (null == checkSpqInfo) {
cartGoodsList.remove(i);
......@@ -184,8 +180,6 @@ public class CalculationSharingDiscountService {
//剔除商品数量为空的
calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
// ApiLog.debug("calculationDiscountGoodsList:{}", JSON.toJSON(calculationDiscountGoodsList));
ApiLog.printLog("calculationDiscountGoodsList:{}", JSON.toJSONString(calculationDiscountGoodsList),null,null);
//throw new BizServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST,"参数促销计算商品有异常");
return null;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java
......@@ -13,12 +13,10 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.ItemService;
import cn.freemud.service.impl.AssortmentSdkService;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ThirdPartyLog;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
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;
......@@ -182,7 +180,6 @@ public class AdditionSharingService {
*/
private ResponseResult checkAdditionalGoods(List<CreateOrderVo.PremiumExchangeActivity.Product> additionalProducts
, List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity> additionalActivityList) {
//ApiLog.debug("checkAdditionalGoods additionalProducts:{}<---->additionalActivityList:{}", JSON.toJSONString(additionalProducts), JSON.toJSONString(additionalActivityList));
//无加价购活动
if (CollectionUtils.isEmpty(additionalActivityList)) {
return ResponseResult.PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST;
......@@ -255,8 +252,6 @@ public class AdditionSharingService {
if (getProductsVoMap.isEmpty()) {
throw new ServiceException(ResponseResult.PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST);
}
//ApiLog.debug("getProductsVoMap:{}", JSON.toJSONString(getProductsVoMap));
ApiLog.printLog("getProductsVoMap:{}", JSON.toJSONString(getProductsVoMap),null,null);
// 获取计算返回的价格
Long originalTotalAmount = shoppingCartGoodsResponseVo.getOriginalTotalAmount();
//Long totalAmount = shoppingCartGoodsDto.getTotalAmount();
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/BuyOneGiveOneSendService.java
......@@ -14,7 +14,6 @@ import cn.freemud.service.ItemService;
import cn.freemud.service.impl.AssortmentSdkService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
......@@ -140,7 +139,6 @@ public class BuyOneGiveOneSendService {
// 赠送、换购商品信息集合
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity> sendGoods = discountResult.getSendGoods();
if(sendGoods == null || sendGoods.isEmpty()){
ApiLog.info("买一赠一寄件活动,未查到赠送、换购商品信息集合,shoppingCartInfoRequestVo,discountResult", shoppingCartInfoRequestVo,discountResult);
return;
}
......@@ -167,7 +165,6 @@ public class BuyOneGiveOneSendService {
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = discountResult.getGoods();
if(goods == null || goods.isEmpty()){
ApiLog.info("买一赠一寄件活动,未查到商品优惠信息,shoppingCartInfoRequestVo,discountResult", shoppingCartInfoRequestVo,discountResult);
return;
}
......@@ -176,7 +173,6 @@ public class BuyOneGiveOneSendService {
// 获取商品参加的优惠活动
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discounts = g.getDiscounts();
if(discounts == null || discounts.isEmpty()){
ApiLog.info("买一赠一寄件活动,优惠商品未查找到优惠集合,shoppingCartInfoRequestVo,discountResult", shoppingCartInfoRequestVo,discountResult);
return;
}
......@@ -186,7 +182,6 @@ public class BuyOneGiveOneSendService {
.collect(Collectors.toList());
if(buyOneGiveOneSendDiscount == null || buyOneGiveOneSendDiscount.isEmpty()){
ApiLog.info("买一赠一寄件活动,优惠商品未参加买一赠一寄件活动,shoppingCartInfoRequestVo,discountResult", shoppingCartInfoRequestVo,discountResult);
return;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java
......@@ -16,8 +16,6 @@ import cn.freemud.enums.GiftTypeEnum;
import cn.freemud.service.ActivityService;
import cn.freemud.utils.WebUtil;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.LogThreadLocal;
//import com.freemud.card.sdk.log.ApiLog;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
......@@ -23,8 +23,8 @@ import cn.freemud.utils.ExceptionUtils;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.PropertyConvertUtil;
import com.alibaba.fastjson.JSON;
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.log.LogThreadLocal;
import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
......@@ -35,6 +35,7 @@ import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailRe
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
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;
......@@ -171,7 +172,6 @@ public class CalculationServiceImpl {
try {
activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(discountRequest);
} catch (Exception ex) {
// log.error("calculation_discount_error " + "/calculation/discount/sharding " + JSON.toJSONString(discountRequest) + " " + ExceptionUtils.getExceptionInfo(ex));
ErrorLog.errorDev("500", "/calculation/discount/sharing_error", ex, discountRequest);
throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
}
......@@ -215,7 +215,7 @@ public class CalculationServiceImpl {
calculationDiscountResult.setSendGoods(Arrays.asList(sendActivity));
}
}
ApiLog.printLog("calculationDiscountResultAfterProcess" ,JSON.toJSONString(calculationDiscountGoodsList),null,null);
ShoppingSdkLogUtil.printLog("calculationDiscountResultAfterProcess" ,JSON.toJSONString(calculationDiscountGoodsList),null);
return calculationDiscountResult;
}
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
......@@ -17,11 +17,10 @@ import cn.freemud.service.thirdparty.CouponClient;
import cn.freemud.service.thirdparty.CustomerExtendClient;
import cn.freemud.utils.BarcodeUtil;
import cn.freemud.utils.ExceptionUtils;
import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
......@@ -197,8 +196,7 @@ public class CouponDiscountCalculation {
}
if (CollectionUtils.isNotEmpty(discountsNew)) {
useCoupon = true;
// ApiLog.debug("couponDiscountCalculation:{}",discountsNew);
ApiLog.printLog("couponDiscountCalculation:{}",JSON.toJSONString(discountsNew),null,null);
ShoppingSdkLogUtil.printLog("couponDiscountCalculation:{}",JSON.toJSONString(discountsNew),null);
//这里过滤掉了 月享卡2.0，因为月享卡2.0商品不用展示划线价，故显示原价
Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> targetDiscount = discountsNew.stream()
.filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())
......@@ -284,8 +282,6 @@ public class CouponDiscountCalculation {
AtomicBoolean changed = new AtomicBoolean();
changed.set(false);
if(CollectionUtils.isNotEmpty(cartGoodsList)){
// ApiLog.debug("合并买3赠1商品券 【merge-before】 : {} ", JSONObject.toJSONString(nowCartGoodsList));
ApiLog.printLog("合并买3赠1商品券 【merge-before】 : {} ", JSONObject.toJSONString(nowCartGoodsList),null,null);
for (int i = cartGoodsList.size() - 1; i >= 1; i--) {
CartGoods cartGoods = cartGoodsList.get(i);
int index2 = nowCartGoodsList.indexOf(cartGoods);
......@@ -298,11 +294,8 @@ public class CouponDiscountCalculation {
cartGoodsNow.setOriginalAmount(cartGoodsNow.getOriginalAmount() + cartGoods.getOriginalAmount());
nowCartGoodsList.remove(i);
}
// ApiLog.debug("合并买3赠1商品券 【merge-ing】 : {} ", JSONObject.toJSONString(nowCartGoodsList));
ApiLog.printLog("合并买3赠1商品券 【merge-ing】 : {} ", JSONObject.toJSONString(nowCartGoodsList),null,null);
}
// ApiLog.debug("合并买3赠1商品券 【merge-after】 : {} ", JSONObject.toJSONString(nowCartGoodsList));
ApiLog.printLog("合并买3赠1商品券 【merge-after】 : {} ", JSONObject.toJSONString(nowCartGoodsList),null,null);
ShoppingSdkLogUtil.printLog("合并买3赠1商品券 【merge-after】 : {} ", JSONObject.toJSONString(nowCartGoodsList),null);
}
if(changed.get()) {
cartGoodsList.clear();
......@@ -662,7 +655,6 @@ public class CouponDiscountCalculation {
}
} catch (NumberFormatException e) {
ErrorLog.errorConvertJson(this.getClass(),"数字转换异常:" + JSON.toJSONString(cartGoods) + ExceptionUtils.getExceptionInfo(e), e);
// log.error("数字转换异常:" + JSON.toJSONString(cartGoods) + ExceptionUtils.getExceptionInfo(e));
throw new ServiceException(ResponseResult.SYSTEM_ERROR);
}
return totalAmount;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java
......@@ -21,10 +21,7 @@ import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
import cn.freemud.utils.WebUtil;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
shopping-cart-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java
......@@ -49,8 +49,6 @@ public class CouoponOnlineTest {
String sign= SignUtil.createMD5Sign(requestDto,appSecret);
requestDto.put("sign",sign);
Object responseDto2 = couponOnlineClient.getCouponDetails(requestDto);
log.debug("requestDto"+requestDto);
// LogUtil.info("couponOnlineClient.getCouponDetails", gson.toJson(requestDto), gson.toJson(responseDto2));
}
@Test
......
shopping-cart-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java
......@@ -65,7 +65,6 @@
// memberRegisterRequestDto.setRegisterType("2");
// memberRegisterRequestDto.setThirdPartyCode("ob0iP4gZeV0jWtRWxRmGtBuE0M9k");
// MemberRegisterResponseDto memberRegisterResponseDto = customerClient.registerByChannel(new MemberRegisterRequestDto());
// log.info("userRegisterResponse===" + memberRegisterResponseDto);
// }
//
// /**
......@@ -80,7 +79,6 @@
// .partnerId("360bb48b-5316-458a-903e-9a44c7f339b1")
// .build();
// JSONObject str = customerClient.editMemberInfo(editMemberInfoRequestDto);
// log.info("str===" + str);
// }
//
// /**
......@@ -97,7 +95,6 @@
// getReceiveListDto.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
// System.out.println("getReceiveListDto==" + new Gson().toJson(getReceiveListDto));
// GetReceiveAddressListResponseDto receiveList = customerClient.getReceiveAddressList(getReceiveListDto);
// log.info("receiveList===" + JSON.toJSON(receiveList));
// }
//
// /**
......@@ -119,7 +116,6 @@
// addReceiveDto.setZipCode("123456");
// System.out.println("addReceiveDto==" + new Gson().toJson(addReceiveDto));
// AddReceiveAddressResponseDto addReceiveDtoResponseDto = customerClient.addReceiveAddress(addReceiveDto);
// log.info("addReceiveDtoResponseDto===" + JSON.toJSON(addReceiveDtoResponseDto));
// }
//
// /**
......@@ -141,7 +137,6 @@
// updateReceiveAddressDto.setMobile("15170070311");
// updateReceiveAddressDto.setReceiveAddress("耀光中环国际 S座");
// UpdateReceiveAddressResponseDto updateReceiveAddressResponseDto = customerClient.updateReceiveAddress(updateReceiveAddressDto);
// log.info("updateReceiveAddressResponseDto===" + new Gson().toJson(updateReceiveAddressResponseDto));
// }
//
// @Test
......@@ -150,7 +145,6 @@
// deleteReceiveAddressDto.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
// deleteReceiveAddressDto.setAddressId("3215308435962838338");
// DeleteReceiveAddressResponseDto responseDto = customerClient.deleteReceiveAddress(deleteReceiveAddressDto);
// log.info("responseDto===" + JSON.toJSON(responseDto));
// }
//
//
......
shopping-cart-application-service/src/test/java/cn.freemud/client/MqTest.java
......@@ -8,7 +8,6 @@ import cn.freemud.amqp.MQService;
import cn.freemud.entities.dto.ActivityCancelStockRequestDto;
import cn.freemud.entities.dto.QueryOrdersResponseDto;
import cn.freemud.utils.FileUtil;
import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ErrorLog;
import org.junit.Test;
......
shopping-cart-application-service/src/test/java/cn.freemud/client/PaymentClientTest.java
......@@ -75,7 +75,6 @@ public class PaymentClientTest {
// transactionBeanList.add(transactionBean);
// orderPayDto.setTransactions(transactionBeanList);
// OrderPayResponseDto orderPayResponseDto = paymentClient.orderPay(orderPayDto);
// log.info("orderPayResponseDto===" + orderPayResponseDto);
// }
/**
......
shopping-cart-application-service/src/test/java/cn.freemud/client/ShoppingCartClientTest.java
......@@ -70,7 +70,6 @@ public class ShoppingCartClientTest {
// productslist.add(products);
// addShoppingCartRequestDto.setProducts(productslist);
// ShoppingCartInfoDto response = shoppingCartClient.addShoppingCart(addShoppingCartRequestDto);
// log.info("response==="+response);
// }
//
// /**
......@@ -85,7 +84,6 @@ public class ShoppingCartClientTest {
// updateShoppingCartRequestDto.setStoreId("1036");
// updateShoppingCartRequestDto.setUserId("m12321332423");
// ShoppingCartBaseResponse shoppingCartBaseResponse = shoppingCartClient.updateShoppingCart(updateShoppingCartRequestDto);
// log.info("shoppingCartBaseResponse==="+shoppingCartBaseResponse);
// }
// /**
// * 查询购物商品
......@@ -100,7 +98,6 @@ public class ShoppingCartClientTest {
// getShoppingCartDto.setStoreId(storeId);
// getShoppingCartDto.setMerchantId(merChant_id);
// ShoppingCartInfoDto shoppingCartInfoDto=shoppingCartClient.getShoppingCart(getShoppingCartDto);
// log.info("shoppingCartInfoDto==="+shoppingCartInfoDto);
// }
//
// /**
......@@ -116,7 +113,6 @@ public class ShoppingCartClientTest {
// clearShoppingCartRequestDto.setStoreId(storeId);
// clearShoppingCartRequestDto.setUserId(userId);
// ShoppingCartBaseResponse shoppingCartBaseResponse = shoppingCartClient.clearShoppingCart(clearShoppingCartRequestDto);
// log.info("shoppingCartBaseResponse==="+shoppingCartBaseResponse);
// }
// /**
// * 删除购物车一个商品
......@@ -129,7 +125,6 @@ public class ShoppingCartClientTest {
// removeShoppingCartRequestDto.setStoreId("1036");
// removeShoppingCartRequestDto.setUserId("wx001");
// ShoppingCartBaseResponse shoppingCartBaseResponse= shoppingCartClient.removeProduct(removeShoppingCartRequestDto);
// log.info("shoppingCartBaseResponse==="+shoppingCartBaseResponse);
// }
......
shopping-cart-application-service/src/test/java/cn.freemud/client/StoreClientTest.java
......@@ -54,7 +54,6 @@
// StoreBaseResponseDto<StoreListResponseDto> response = storeClient.findNearStores(nearStoreRequestDto);
// StoreListResponseDto storeListResponseDto=response.getBizVO();
// List<StoreResponseDto> list=storeListResponseDto.getList();
// log.info("storeId " + "freeDeliveryPrice "+"deliveryPrice " +"delivery" );
// for (StoreResponseDto store:list){
// String insert="INSERT INTO open_platform_partner_store_delivery_config (`partner_id`, `store_id`, `delivery_limit_amount`, `delivery_amount`, `default_delivery_range`, `add_range_count`, `add_range_amount`, `gmt_created`, `gmt_modified`) VALUES ('"+nearStoreRequestDto.getPartnerId()+"', '"+store.getStoreCode()+"','"+store.getFreeDeliveryPrice()*100+"','"+store.getDeliveryPrice()*100+"', '3000', '3000', '250', '2018-12-13 17:08:25', '2018-12-13 18:15:43');";
// System.out.println(insert);
......@@ -70,7 +69,6 @@
// storeInfoRequestDto.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
// storeInfoRequestDto.setStoreCode("");
// StoreBaseResponseDto<StoreResponseDto> storeBaseResponseDto = storeClient.getStoreInfo(storeInfoRequestDto);
// log.info("storeBaseResponseDto==="+storeBaseResponseDto);
// }
// /**
// * 查询门店轮播图
......@@ -82,6 +80,5 @@
// toreImagesRequestDto.setBusinessId("");
// toreImagesRequestDto.setTypeFlag(1);
// StoreBaseResponseDto<StoreImageListResponseDto> storeBaseResponseDto = storeClient.findStoreImages(toreImagesRequestDto);
// log.info("storeBaseResponseDto==="+storeBaseResponseDto);
// }
//}
shopping-cart-application-service/src/test/java/cn.freemud/client/StoreItemClientTest.java
......@@ -51,7 +51,6 @@ public class StoreItemClientTest {
getMenuCategoryInfoDto.setShopId("1036");
getMenuCategoryInfoDto.setValid(true);
GetMenuResponseDto getMenuResponseDto = storeItemClient.getMenuCategory(getMenuCategoryInfoDto);
log.debug("jsonObject===" + new Gson().toJson(getMenuResponseDto));
}
......@@ -72,7 +71,6 @@ public class StoreItemClientTest {
getProductInfoDto.setProductInfoType(2);
getProductInfoDto.setProductIds(productIds);
ProductInfosDto productInfosDto = storeItemClient.listProductInfos(getProductInfoDto);
log.debug("json==" + productInfosDto);
}
......
shopping-cart-application-service/src/test/java/cn.freemud/client/WeChatClientTest.java
......@@ -50,7 +50,6 @@
// String jsCode = "011KDpYO1dOXc216tK0P1WnGYO1KDpY8";
// String grantType = "authorization_code";
// String responseMessage = weChatClient.getSession(appid, secret, jsCode, grantType);
// log.info("str==" + responseMessage);
// }
//
// /**
......@@ -76,7 +75,6 @@
// String secret = "0b4393b502b81b5df486bab3e3ed2633";
// String grantType = "client_credential";
// WeChatGetAccessTokenResponseDto responseDto = weChatClient.getAccessToken(grantType, appid, secret);
// log.info("token==" + new Gson().toJson(responseDto));
// }
//
// /**
......@@ -89,7 +87,6 @@
// getWxQrcodeDto.setPage("");
// getWxQrcodeDto.setWidth(430);
// String str = weChatClient.getWxacodeunlimit(getWxQrcodeDto);
// log.info("wxqrcode==" + str);
// }
//
// /**
......@@ -126,6 +123,5 @@
// wechatSendMessageDto.setPage(page);
// wechatSendMessageDto.setEmphasis_keyword(emphasisKeyword);
// String str = weChatClient.sendMessageNotice(accessToken, wechatSendMessageDto);
// log.info("getTemplateMessage==" + str);
// }
//}
shopping-cart-application-service/src/test/java/cn.freemud/manager/IappWxappConfigManagerTest.java
......@@ -33,7 +33,6 @@ public class IappWxappConfigManagerTest {
Gson gson = new Gson();
String wxAppid="wxec91c5923af56886";
OpenPlatformIappWxappConfig iappWxappConfig = iappWxappConfigManager.findIappWxappConfigByWxAppid(wxAppid);
log.debug("iappWxappConfig=="+gson.toJson(iappWxappConfig));
}
......
shopping-cart-application-service/src/test/java/cn.freemud/manager/PartnerManagerTest.java
......@@ -34,6 +34,5 @@ public class PartnerManagerTest {
public void selectByPartnerId(){
String partnerId="360bb48b-5316-458a-903e-9a44c7f339b1";
Partner partner=partnerManager.selectByPartnerId(partnerId);
log.debug("partner=="+partner);
}
}
shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartMealServiceTest.java
......@@ -34,7 +34,6 @@ import org.springframework.test.context.junit4.SpringRunner;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
......@@ -56,7 +55,6 @@ public class ShoppingCartMealServiceTest {
addShoppingCartGoodsRequestVo.setSessionId(sessionId);
long startTime = System.currentTimeMillis();
BaseResponse response = shoppingCartBaseService.addGoods(addShoppingCartGoodsRequestVo);
log.debug("addGoods consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
}
@Test
......@@ -73,7 +71,6 @@ public class ShoppingCartMealServiceTest {
"}";
UpdateShoppingCartGoodsQtyRequestVo requestVo = JSONObject.parseObject(requestJson, UpdateShoppingCartGoodsQtyRequestVo.class);
BaseResponse response = shoppingCartBaseService.updateGoodsQty(requestVo);
log.debug("updateGoodsQty response:{}", JSONObject.toJSONString(response));
Assert.assertNotNull(response);
Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
}
......@@ -81,7 +78,6 @@ public class ShoppingCartMealServiceTest {
@Test
public void listCartGoodsTest() {
BaseResponse response = listCartGoods();
log.debug("listCartGoods response:{}", JSONObject.toJSONString(response));
Assert.assertNotNull(response);
Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
......@@ -107,7 +103,6 @@ public class ShoppingCartMealServiceTest {
ShoppingCartInfoRequestVo shoppingCartInfoRequestVo = JSONObject.parseObject(requestJson, ShoppingCartInfoRequestVo.class);
CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity = new CreateOrderVo.PremiumExchangeActivity();
BaseResponse<ShoppingCartGoodsDto> response = this.shoppingCartBaseService.getShoppingCartGoods(shoppingCartInfoRequestVo, premiumExchangeActivity);
log.debug("getShoppingCart response:{}", JSONObject.toJSONString(response));
Assert.assertNotNull(response);
Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
}
......@@ -128,7 +123,6 @@ public class ShoppingCartMealServiceTest {
long startTime = System.currentTimeMillis();
CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity = new CreateOrderVo.PremiumExchangeActivity();
BaseResponse<ShoppingCartGoodsDto> response = this.shoppingCartBaseService.getShoppingCartGoods(shoppingCartInfoRequestVo, premiumExchangeActivity);
log.debug("getShoppingCart consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
Assert.assertNotNull(response);
Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
try {
......@@ -164,7 +158,6 @@ public class ShoppingCartMealServiceTest {
requestVo.setSessionId("unitTestMeal2");
requestVo.setOperationType(operationEnum.getOperationType());
BaseResponse response = this.shoppingCartBaseService.clear(requestVo);
log.debug("clear consumeTime:{} operationType:{} response:{}", System.currentTimeMillis() - startTime, operationEnum.getOperationType(), JSONObject.toJSONString(response));
Assert.assertNotNull(response);
Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
}
......@@ -190,7 +183,6 @@ public class ShoppingCartMealServiceTest {
//查询购物车
long startTime = System.currentTimeMillis();
BaseResponse<ShoppingCartGoodsMealResponseVo> response = listCartGoods();
log.debug("listCartGoods consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
Assert.assertNotNull(response);
Assert.assertEquals(ResponseResult.SUCCESS.getCode(), response.getCode());
Integer carVer = response.getResult().getCarVer();
......@@ -198,10 +190,8 @@ public class ShoppingCartMealServiceTest {
toOrder(carVer);
//再次查询购物车
response = listCartGoods();
log.debug("toOrder listCartGoods consumeTime:{} response:{}", System.currentTimeMillis() - startTime, JSONObject.toJSONString(response));
//清台
this.clearAllTest();
log.debug("查询、下单、清空 consumeTime:{}", System.currentTimeMillis() - startTime);
}
}
shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartNewServiceTest.java
......@@ -51,7 +51,6 @@ public class ShoppingCartNewServiceTest {
// requestVo.setEncryptCode("U07nEpq1aYHLSkLqI6m1IjUezTvRhfBdz+ZY1iOZ09SxAglRkpS4D98HFLrYk9Sd");
// requestVo.setCouponType(0);
// BaseResponse baseResponse = shoppingCartNewService.addGoodsByCard(requestVo);
// log.info("baseResponse : " + baseResponse);
// }
@Test
......@@ -59,7 +58,6 @@ public class ShoppingCartNewServiceTest {
String requestJson = "{\"appId\":\"wxb78fb7c6218cb52c\",\"categoryName\":\"库存\",\"orderType\":1,\"partnerId\":\"1864\",\"productComboList\":[],\"productGroupList\":[],\"sessionId\":\"9f4da5564ee1b7d0c72a29ad854e58eb9be68c05\",\"shopId\":\"999999998\",\"skuId\":\"\",\"spuId\":\"152352063746106644\"}";
AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo = JSONObject.parseObject(requestJson, AddShoppingCartGoodsRequestVo.class);
BaseResponse response = shoppingCartNewService.addGoods(addShoppingCartGoodsRequestVo);
log.debug("shoppingCartGoodsResponseVo==" + JSONObject.toJSONString(response));
}
......@@ -68,7 +66,6 @@ public class ShoppingCartNewServiceTest {
String requestJson = "{\"appId\":\"wxb78fb7c6218cb52c\",\"cartGoodsUid\":\"4761ad89-ddf6-4063-bcfd-e59b5a42be37\",\"orderType\":1,\"partnerId\":\"1864\",\"qty\":5,\"sessionId\":\"9f4da5564ee1b7d0c72a29ad854e58eb9be68c05\",\"shopId\":\"999999998\"}";
UpdateShoppingCartGoodsQtyRequestVo updateShoppingCartGoodsQtyRequestVo = JSONObject.parseObject(requestJson, UpdateShoppingCartGoodsQtyRequestVo.class);
BaseResponse shoppingCartGoodsResponseVo = shoppingCartNewService.updateGoodsQty(updateShoppingCartGoodsQtyRequestVo);
log.debug("shoppingCartGoodsResponseVo:{}" , JSONObject.toJSONString(shoppingCartGoodsResponseVo));
}
@Test
......@@ -84,7 +81,6 @@ public class ShoppingCartNewServiceTest {
"}";
ShoppingCartInfoRequestVo shoppingCartInfoRequestVo = JSONObject.parseObject(requestJson, ShoppingCartInfoRequestVo.class);
BaseResponse shoppingCartGoodsResponseVo = shoppingCartNewService.getGoodsList(shoppingCartInfoRequestVo);
log.debug("shoppingCartGoodsResponseVo==" + JSONObject.toJSONString(shoppingCartGoodsResponseVo));
}
@Test
......
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