Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Android
TradeSteward
Commits
da0f282d
Commit
da0f282d
authored
10 months ago
by
linwei
Browse files
Options
Download
Email Patches
Plain Diff
优化录单活动产品存在校验逻辑
parent
8c1d29b8
master
dev
dev-learning-center
dev-uniapp
master-uniapp
v9.39.0_tag
v9.38.0_tag
v9.37.1_tag
v9.37.0_tag
v9.36.1_tag
v9.36.0_tag
v9.35.0_tag
v9.34.2_tag
v9.34.1_tag
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/com/wgmf/trade/ui/fra/index/MemberActionListFra.java
+2
-1
src/com/wgmf/trade/ui/fra/index/MemberActionListFra.java
with
2 additions
and
1 deletion
+2
-1
src/com/wgmf/trade/ui/fra/index/MemberActionListFra.java
+
2
-
1
View file @
da0f282d
...
...
@@ -207,7 +207,8 @@ public class MemberActionListFra extends BaseFra<MemberActionListCon.Pre>
filterProGroupItemIdAndPrice
(
selectedMemberAction
.
rule
.
proGroupInfo
,
false
);
if
(
selectedMemberAction
.
giftRule
!=
null
)
{
filterProItemIdAndPrice
(
selectedMemberAction
.
giftRule
.
giftProductInfo
);
filterProGroupItemIdAndPrice
(
selectedMemberAction
.
giftRule
.
giftProGroupInfo
,
true
);
//赠品组合缺产品不用提示
//filterProGroupItemIdAndPrice(selectedMemberAction.giftRule.giftProGroupInfo, true);//赠品组合缺产品不用提示
filterProGroupItemIdAndPrice
(
selectedMemberAction
.
giftRule
.
giftProGroupInfo
,
false
);
//赠品组合缺产品不用提示
}
Date
nowDate
=
new
Date
();
Date
actionTime
=
DateTimeUtils
.
getDateFromString
(
selectedMemberAction
.
endTime
);
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help