Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-webapp-plug
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-webapp-plug
Commits
dfb7d21d
Commit
dfb7d21d
authored
Sep 14, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pmd
parent
bc70f18d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
ScreeningController.java
...java/com/gic/plug/web/controller/ScreeningController.java
+2
-1
AppletConfigGoodsController.java
...lug/web/controller/goods/AppletConfigGoodsController.java
+9
-2
ScreenBackStrategy.java
...in/java/com/gic/plug/web/strategy/ScreenBackStrategy.java
+1
-0
No files found.
src/main/java/com/gic/plug/web/controller/ScreeningController.java
View file @
dfb7d21d
...
@@ -71,7 +71,8 @@ public class ScreeningController {
...
@@ -71,7 +71,8 @@ public class ScreeningController {
}
}
if
(
Constant
.
ERP_GOODS_SCREEN
.
equals
(
sceneCode
)
||
Constant
.
WEIMOB_GOODS_SCREEN
.
equals
(
sceneCode
)
||
Constant
.
CHANNEL_CODE_MALL
.
equals
(
sceneCode
))
{
if
(
Constant
.
ERP_GOODS_SCREEN
.
equals
(
sceneCode
)
||
Constant
.
WEIMOB_GOODS_SCREEN
.
equals
(
sceneCode
)
||
Constant
.
CHANNEL_CODE_MALL
.
equals
(
sceneCode
))
{
//TODO
//TODO
if
(
"1129"
.
equals
(
enterpriseId
))
{
String
testEnterpriseId
=
"1129"
;
if
(
testEnterpriseId
.
equals
(
enterpriseId
))
{
enterpriseId
=
"goods-test-1129"
;
enterpriseId
=
"goods-test-1129"
;
}
}
}
}
...
...
src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java
View file @
dfb7d21d
...
@@ -39,6 +39,10 @@ import java.util.stream.Collectors;
...
@@ -39,6 +39,10 @@ import java.util.stream.Collectors;
/**
/**
* 商城装修选择器
* 商城装修选择器
* @ClassName: AppletConfigGoodsController
* @Description:
* @author guojuxing
* @date 2020/9/14 10:58 AM
*/
*/
@RestController
@RestController
public
class
AppletConfigGoodsController
extends
BaseGoodsController
{
public
class
AppletConfigGoodsController
extends
BaseGoodsController
{
...
@@ -240,13 +244,16 @@ public class AppletConfigGoodsController extends BaseGoodsController {
...
@@ -240,13 +244,16 @@ public class AppletConfigGoodsController extends BaseGoodsController {
DynamicSearchDTO
searchDTO
=
new
DynamicSearchDTO
();
DynamicSearchDTO
searchDTO
=
new
DynamicSearchDTO
();
String
searchCode
=
""
;
String
searchCode
=
""
;
JSONObject
status
=
new
JSONObject
();
JSONObject
status
=
new
JSONObject
();
if
(
type
==
1
)
{
int
mall
=
1
;
int
mallInfomation
=
2
;
if
(
type
==
mall
)
{
if
(
Constant
.
CHANNEL_CODE_MALL
.
equals
(
channelCode
))
{
if
(
Constant
.
CHANNEL_CODE_MALL
.
equals
(
channelCode
))
{
searchCode
=
"gic_mall_goods"
;
searchCode
=
"gic_mall_goods"
;
}
else
if
(
Constant
.
CHANNEL_CODE_ERP
.
equals
(
channelCode
))
{
}
else
if
(
Constant
.
CHANNEL_CODE_ERP
.
equals
(
channelCode
))
{
searchCode
=
"erp_goods"
;
searchCode
=
"erp_goods"
;
}
}
}
else
if
(
type
==
2
)
{
}
else
if
(
type
==
mallInfomation
)
{
if
(
Constant
.
CHANNEL_CODE_MALL
.
equals
(
channelCode
))
{
if
(
Constant
.
CHANNEL_CODE_MALL
.
equals
(
channelCode
))
{
searchCode
=
"gic_mall_goods_self"
;
searchCode
=
"gic_mall_goods_self"
;
}
}
...
...
src/main/java/com/gic/plug/web/strategy/ScreenBackStrategy.java
View file @
dfb7d21d
...
@@ -19,6 +19,7 @@ public interface ScreenBackStrategy {
...
@@ -19,6 +19,7 @@ public interface ScreenBackStrategy {
* @param key
* @param key
* @param enterpriseId
* @param enterpriseId
* @return com.gic.plug.web.vo.ScreenBack
* @return com.gic.plug.web.vo.ScreenBack
* @exception
*/
*/
ScreenBack
screenBack
(
String
compute
,
String
value
,
String
key
,
Integer
enterpriseId
)
throws
ClassNotFoundException
;
ScreenBack
screenBack
(
String
compute
,
String
value
,
String
key
,
Integer
enterpriseId
)
throws
ClassNotFoundException
;
}
}
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