Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
3529be88
Commit
3529be88
authored
May 26, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
当前时间点 默认走同享逻辑上线 2022年5月26日17:23:00
parent
f17f2564
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+3
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
View file @
3529be88
...
...
@@ -25,6 +25,10 @@ import java.util.List;
@Data
public
class
ShoppingCartGoodsResponseVo
extends
ShoppingCartGoodsBaseResponseVo
{
/**
* 用于看前端第几次请求
*/
private
Long
currentTime
=
System
.
currentTimeMillis
();
/**
* 配送费的清单 包含 普通配送费 额外夜间配送费 额外白天配送费 下面的 deliveryAmount 是总的配送费
*/
List
<
ExtraDeliveryDto
>
deliveryAmountList
=
new
ArrayList
<>();
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
3529be88
...
...
@@ -193,6 +193,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
@Autowired
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_"
;
// @Value("${saas.cart.sharing}")
...
...
@@ -1060,6 +1062,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
ShoppingCartGoodsResponseVo
shoppingCartGoodsResponseVo
=
goodsList
.
getResult
();
// fisherman -> 储值卡互斥需求 发现bug 导致返回购物车数据不对 当前时间节点无法修复 重新请求一次
if
(
Objects
.
nonNull
(
shoppingCartInfoRequestVo
.
getEnableSharing
())
&&
shoppingCartInfoRequestVo
.
getEnableSharing
().
compareTo
(
0
)
==
0
)
{
logUtil
.
info
(
"fisherman -> 当前请求了2次计算操作"
,
shoppingCartInfoRequestVo
.
getSessionId
());
goodsList
=
getGoodsList
(
shoppingCartInfoRequestVo
);
if
(
goodsList
==
null
||
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
goodsList
.
getCode
()))
{
return
goodsList
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment