Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
c796bbc9
Commit
c796bbc9
authored
Oct 09, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug-555: 订单V值规则渠道保存异常修复
parent
52486990
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
OrderVStrategy.java
.../module/member/mq/consumer/score/core/OrderVStrategy.java
+2
-3
ScoreRuleOrderVExtraVO.java
...ule/member/vo/scoreRule/extra/ScoreRuleOrderVExtraVO.java
+1
-1
No files found.
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/score/core/OrderVStrategy.java
View file @
c796bbc9
...
@@ -166,7 +166,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
...
@@ -166,7 +166,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
* @param orderId
* @param orderId
* @return
* @return
*/
*/
private
Integer
getScoreCount
(
Integer
transportId
,
Long
channelId
,
String
allowChannels
,
List
<
ScoreRuleOrderVExtraVO
.
OrderVRule
>
orderVRules
,
Long
orderId
)
{
private
Integer
getScoreCount
(
Integer
transportId
,
Long
channelId
,
List
<
Long
>
allowChannels
,
List
<
ScoreRuleOrderVExtraVO
.
OrderVRule
>
orderVRules
,
Long
orderId
)
{
Integer
scoreCount
=
0
;
Integer
scoreCount
=
0
;
List
<
OrderItemRespDTO
>
orderItems
=
orderApi
.
getOrderItemsByOrderId
(
orderId
);
List
<
OrderItemRespDTO
>
orderItems
=
orderApi
.
getOrderItemsByOrderId
(
orderId
);
if
(
orderItems
==
null
)
{
if
(
orderItems
==
null
)
{
...
@@ -185,8 +185,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
...
@@ -185,8 +185,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
}
else
if
(
transportId
==
TransportTypeEnum
.
SPECIAL_LINE_AIR_FREIGHT
.
getValue
())
{
}
else
if
(
transportId
==
TransportTypeEnum
.
SPECIAL_LINE_AIR_FREIGHT
.
getValue
())
{
// 空运校验渠道
// 空运校验渠道
// 渠道id
// 渠道id
String
[]
channels
=
allowChannels
.
split
(
","
);
if
(!
allowChannels
.
contains
(
channelId
))
{
if
(!
ArrayUtil
.
contains
(
channels
,
channelId
.
toString
()))
{
return
0
;
return
0
;
}
}
// 空运算重量
// 空运算重量
...
...
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/scoreRule/extra/ScoreRuleOrderVExtraVO.java
View file @
c796bbc9
...
@@ -22,7 +22,7 @@ public class ScoreRuleOrderVExtraVO {
...
@@ -22,7 +22,7 @@ public class ScoreRuleOrderVExtraVO {
@ApiModelProperty
(
value
=
"提货点列表(第一级提货点,第二级国家,城市,仓库id)"
,
required
=
true
)
@ApiModelProperty
(
value
=
"提货点列表(第一级提货点,第二级国家,城市,仓库id)"
,
required
=
true
)
private
List
<
List
<
Long
>>
receiveAddrList
;
private
List
<
List
<
Long
>>
receiveAddrList
;
@ApiModelProperty
(
value
=
"渠道,运输方式选择海运时,渠道隐藏,可多选,逗号拼接"
)
@ApiModelProperty
(
value
=
"渠道,运输方式选择海运时,渠道隐藏,可多选,逗号拼接"
)
private
String
channel
;
private
List
<
Long
>
channel
;
@ApiModelProperty
(
value
=
"积分规则列表"
,
required
=
true
)
@ApiModelProperty
(
value
=
"积分规则列表"
,
required
=
true
)
private
List
<
OrderVRule
>
orderVRule
;
private
List
<
OrderVRule
>
orderVRule
;
@ApiModelProperty
(
value
=
"订单入口(1后台,2APP,3WEB)可多选,逗号拼"
,
required
=
true
)
@ApiModelProperty
(
value
=
"订单入口(1后台,2APP,3WEB)可多选,逗号拼"
,
required
=
true
)
...
...
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