Commit 7890754a by 周晓航

Merge branch 'KA-20210714-线上购物车异常修复'

parents 9df25c4c 5fad2a91
...@@ -143,7 +143,6 @@ public class GradDeliveryServiceImpl extends AbstractDeliveryServiceImpl impleme ...@@ -143,7 +143,6 @@ public class GradDeliveryServiceImpl extends AbstractDeliveryServiceImpl impleme
request.setStoreCode(storeCode); request.setStoreCode(storeCode);
StoreCBaseResponse<StoreCBaseResponseDto> responseDto = storeBaseApiClient.queryDeliverDetail(request); StoreCBaseResponse<StoreCBaseResponseDto> responseDto = storeBaseApiClient.queryDeliverDetail(request);
//ApiLog.info("fisherman 获取门店预计送达时间",request,responseDto); //ApiLog.info("fisherman 获取门店预计送达时间",request,responseDto);
ApiLog.printLog("fisherman 获取门店预计送达时间", JSON.toJSONString(request),JSON.toJSONString(responseDto),null);
if (responseDto == null) { if (responseDto == null) {
throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR); throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR);
} }
......
...@@ -230,7 +230,6 @@ public class CouponPromotionService implements IPromotionService { ...@@ -230,7 +230,6 @@ public class CouponPromotionService implements IPromotionService {
activityDiscountsDtos.add(activityDiscountsDto); activityDiscountsDtos.add(activityDiscountsDto);
} }
} }
LogUtil.info("fisherman 获取优惠券的信息 存放入 setActivityDiscountsDtos ---",calculationDiscountResult,activityDiscountsDtos);
// fisherman activityDiscountsDtos 设置 用于存放 settlement表 // fisherman activityDiscountsDtos 设置 用于存放 settlement表
shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos); shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos);
} }
......
...@@ -721,7 +721,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -721,7 +721,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
, deliveryAmount , deliveryAmount
, null); , null);
// ApiLog.info("fisherman 新算价 配送费字段数据 01 ",calculationSharingDiscountResult,shoppingCartGoodsResponseVo); // ApiLog.info("fisherman 新算价 配送费字段数据 01 ",calculationSharingDiscountResult,shoppingCartGoodsResponseVo);
ApiLog.printLog("fisherman 新算价 配送费字段数据 01 ", JSON.toJSONString(calculationSharingDiscountResult),JSON.toJSONString(shoppingCartGoodsResponseVo),null);
sharingCartService.distribute(calculationSharingDiscountResult sharingCartService.distribute(calculationSharingDiscountResult
, cartGoodsList , cartGoodsList
, shoppingCartGoodsResponseVo , shoppingCartGoodsResponseVo
...@@ -737,7 +736,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -737,7 +736,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
, userId , userId
, storeId); , storeId);
// ApiLog.info("fisherman 新算价 配送费字段数据 02 ",null,shoppingCartGoodsResponseVo);shoppingCartGoodsResponseVo // ApiLog.info("fisherman 新算价 配送费字段数据 02 ",null,shoppingCartGoodsResponseVo);shoppingCartGoodsResponseVo
ApiLog.printLog("fisherman 新算价 配送费字段数据 02 ",JSON.toJSONString(shoppingCartGoodsResponseVo), null,null);
buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,calculationSharingDiscountResult,shoppingCartInfoRequestVo.getFlag(),partnerId); buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,calculationSharingDiscountResult,shoppingCartInfoRequestVo.getFlag(),partnerId);
} }
else { else {
...@@ -1873,7 +1871,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1873,7 +1871,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
} }
} }
} }
LogUtil.info("fisherman 满额减配送算价格",discount,shoppingCartGoodsResponseVo);
} }
/** /**
...@@ -1882,7 +1879,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1882,7 +1879,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
MaterialPromotionService materialPromotionService = (MaterialPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.Material); MaterialPromotionService materialPromotionService = (MaterialPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.Material);
materialPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo); materialPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
LogUtil.info("fisherman 促销活动计算价格 05",JSON.toJSONString(shoppingCartGoodsResponseVo), JSON.toJSONString(couponPromotionVO));
} }
/** /**
......
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