Commit 3529be88 by 周晓航

当前时间点 默认走同享逻辑上线 2022年5月26日17:23:00

parent f17f2564
...@@ -25,6 +25,10 @@ import java.util.List; ...@@ -25,6 +25,10 @@ import java.util.List;
@Data @Data
public class ShoppingCartGoodsResponseVo extends ShoppingCartGoodsBaseResponseVo{ public class ShoppingCartGoodsResponseVo extends ShoppingCartGoodsBaseResponseVo{
/** /**
* 用于看前端第几次请求
*/
private Long currentTime = System.currentTimeMillis();
/**
* 配送费的清单 包含 普通配送费 额外夜间配送费 额外白天配送费 下面的 deliveryAmount 是总的配送费 * 配送费的清单 包含 普通配送费 额外夜间配送费 额外白天配送费 下面的 deliveryAmount 是总的配送费
*/ */
List<ExtraDeliveryDto> deliveryAmountList = new ArrayList<>(); List<ExtraDeliveryDto> deliveryAmountList = new ArrayList<>();
......
...@@ -193,6 +193,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -193,6 +193,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
@Autowired @Autowired
private StoreItemAdapter storeItemAdapter; private StoreItemAdapter storeItemAdapter;
@Autowired
private com.freemud.application.sdk.api.ordercenter.util.LogUtil logUtil;
private static final String limitCartKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_"; private static final String limitCartKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_";
// @Value("${saas.cart.sharing}") // @Value("${saas.cart.sharing}")
...@@ -1060,6 +1062,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1060,6 +1062,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = goodsList.getResult(); ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = goodsList.getResult();
// fisherman -> 储值卡互斥需求 发现bug 导致返回购物车数据不对 当前时间节点无法修复 重新请求一次 // fisherman -> 储值卡互斥需求 发现bug 导致返回购物车数据不对 当前时间节点无法修复 重新请求一次
if (Objects.nonNull(shoppingCartInfoRequestVo.getEnableSharing()) && shoppingCartInfoRequestVo.getEnableSharing().compareTo(0) == 0) { if (Objects.nonNull(shoppingCartInfoRequestVo.getEnableSharing()) && shoppingCartInfoRequestVo.getEnableSharing().compareTo(0) == 0) {
logUtil.info("fisherman -> 当前请求了2次计算操作", shoppingCartInfoRequestVo.getSessionId());
goodsList = getGoodsList(shoppingCartInfoRequestVo); goodsList = getGoodsList(shoppingCartInfoRequestVo);
if (goodsList == null || !ResponseResult.SUCCESS.getCode().equals(goodsList.getCode())) { if (goodsList == null || !ResponseResult.SUCCESS.getCode().equals(goodsList.getCode())) {
return goodsList; return goodsList;
......
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