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
d86c7024
Commit
d86c7024
authored
Mar 26, 2020
by
何文超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加barCode
parent
ffbda0a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
15 deletions
+17
-15
AppletConfigGoodsController.java
...lug/web/controller/goods/AppletConfigGoodsController.java
+17
-15
No files found.
src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java
View file @
d86c7024
package
com
.
gic
.
plug
.
web
.
controller
.
goods
;
package
com
.
gic
.
plug
.
web
.
controller
.
goods
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.EntityUtil
;
...
@@ -37,6 +22,20 @@ import com.gic.search.business.api.service.EsBusinessOperaApiService;
...
@@ -37,6 +22,20 @@ import com.gic.search.business.api.service.EsBusinessOperaApiService;
import
com.gic.search.business.api.utils.QueryConditionAssemblyUtil
;
import
com.gic.search.business.api.utils.QueryConditionAssemblyUtil
;
import
com.gic.widget.screening.api.service.EsScreeningSearchService
;
import
com.gic.widget.screening.api.service.EsScreeningSearchService
;
import
com.google.common.base.Joiner
;
import
com.google.common.base.Joiner
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 商城装修选择器
* 商城装修选择器
...
@@ -240,9 +239,12 @@ public class AppletConfigGoodsController {
...
@@ -240,9 +239,12 @@ public class AppletConfigGoodsController {
OperateEnum
.
OPERATE_LIKE
,
search
);
OperateEnum
.
OPERATE_LIKE
,
search
);
JSONObject
goodsNameJson
=
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
"goodsName"
,
JSONObject
goodsNameJson
=
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
"goodsName"
,
OperateEnum
.
OPERATE_LIKE
,
search
);
OperateEnum
.
OPERATE_LIKE
,
search
);
JSONObject
goodsBarCodeJson
=
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
"goodsBarCode"
,
OperateEnum
.
OPERATE_LIKE
,
search
);
List
<
JSONObject
>
jsonArray
=
new
ArrayList
<>();
List
<
JSONObject
>
jsonArray
=
new
ArrayList
<>();
jsonArray
.
add
(
goodsCodeJson
);
jsonArray
.
add
(
goodsCodeJson
);
jsonArray
.
add
(
goodsNameJson
);
jsonArray
.
add
(
goodsNameJson
);
jsonArray
.
add
(
goodsBarCodeJson
);
JSONObject
object
=
QueryConditionAssemblyUtil
.
createListQueryNode
(
jsonArray
,
OperateEnum
.
OPERATE_OR
);
JSONObject
object
=
QueryConditionAssemblyUtil
.
createListQueryNode
(
jsonArray
,
OperateEnum
.
OPERATE_OR
);
jsonObject
=
QueryConditionAssemblyUtil
.
addQueryNodeForSiblin
(
object
,
jsonObject
,
OperateEnum
.
OPERATE_AND
);
jsonObject
=
QueryConditionAssemblyUtil
.
addQueryNodeForSiblin
(
object
,
jsonObject
,
OperateEnum
.
OPERATE_AND
);
}
}
...
...
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