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
258f273d
Commit
258f273d
authored
Sep 14, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pmd
parent
68fd06b5
Hide whitespace changes
Inline
Side-by-side
Showing
61 changed files
with
511 additions
and
98 deletions
+511
-98
ProvincesController.java
...java/com/gic/plug/web/controller/ProvincesController.java
+1
-0
ScreeningController.java
...java/com/gic/plug/web/controller/ScreeningController.java
+6
-2
StoreController.java
...ain/java/com/gic/plug/web/controller/StoreController.java
+1
-1
UploadImgController.java
...java/com/gic/plug/web/controller/UploadImgController.java
+2
-2
AppletConfigGoodsController.java
...lug/web/controller/goods/AppletConfigGoodsController.java
+13
-3
BaseGoodsController.java
...om/gic/plug/web/controller/goods/BaseGoodsController.java
+7
-1
GoodsBrandController.java
...m/gic/plug/web/controller/goods/GoodsBrandController.java
+11
-5
GoodsCategoryController.java
...ic/plug/web/controller/goods/GoodsCategoryController.java
+7
-1
GoodsController.java
...va/com/gic/plug/web/controller/goods/GoodsController.java
+10
-10
GoodsDomainController.java
.../gic/plug/web/controller/goods/GoodsDomainController.java
+7
-7
GoodsPropertyController.java
...ic/plug/web/controller/goods/GoodsPropertyController.java
+7
-1
GoodsRightsSelectorController.java
...g/web/controller/goods/GoodsRightsSelectorController.java
+7
-1
GoodsSelectorController.java
...ic/plug/web/controller/goods/GoodsSelectorController.java
+15
-15
GoodsStandardController.java
...ic/plug/web/controller/goods/GoodsStandardController.java
+7
-1
PageQO.java
src/main/java/com/gic/plug/web/qo/PageQO.java
+1
-1
StoreWidgetCountQO.java
src/main/java/com/gic/plug/web/qo/StoreWidgetCountQO.java
+7
-1
StoreWidgetQO.java
src/main/java/com/gic/plug/web/qo/StoreWidgetQO.java
+7
-1
GoodsQO.java
src/main/java/com/gic/plug/web/qo/goods/GoodsQO.java
+7
-1
GoodsRightsSelectorSaveQO.java
.../com/gic/plug/web/qo/goods/GoodsRightsSelectorSaveQO.java
+7
-1
GoodsRightsSelectorUpdateQO.java
...om/gic/plug/web/qo/goods/GoodsRightsSelectorUpdateQO.java
+7
-1
GoodsSelectorSaveQO.java
...n/java/com/gic/plug/web/qo/goods/GoodsSelectorSaveQO.java
+7
-1
GoodsSelectorUpdateQO.java
...java/com/gic/plug/web/qo/goods/GoodsSelectorUpdateQO.java
+7
-1
ScreenBackStrategy.java
...in/java/com/gic/plug/web/strategy/ScreenBackStrategy.java
+7
-1
StoreAreaBackImpl.java
...ava/com/gic/plug/web/strategy/impl/StoreAreaBackImpl.java
+7
-1
StoreBackImpl.java
...in/java/com/gic/plug/web/strategy/impl/StoreBackImpl.java
+7
-1
StoreBrandBackImpl.java
...va/com/gic/plug/web/strategy/impl/StoreBrandBackImpl.java
+7
-1
StoreCustomBackImpl.java
...a/com/gic/plug/web/strategy/impl/StoreCustomBackImpl.java
+8
-8
StoreGroupBackImpl.java
...va/com/gic/plug/web/strategy/impl/StoreGroupBackImpl.java
+7
-1
StoreRegionBackImpl.java
...a/com/gic/plug/web/strategy/impl/StoreRegionBackImpl.java
+7
-1
StoreTagBackImpl.java
...java/com/gic/plug/web/strategy/impl/StoreTagBackImpl.java
+7
-1
StrategyInit.java
...ain/java/com/gic/plug/web/strategy/init/StrategyInit.java
+7
-1
ComputeBackUtil.java
src/main/java/com/gic/plug/web/utils/ComputeBackUtil.java
+7
-1
StoreRegionAuthUtil.java
...main/java/com/gic/plug/web/utils/StoreRegionAuthUtil.java
+7
-1
CityVO.java
src/main/java/com/gic/plug/web/vo/CityVO.java
+10
-1
CountyVO.java
src/main/java/com/gic/plug/web/vo/CountyVO.java
+11
-1
ProvinceVO.java
src/main/java/com/gic/plug/web/vo/ProvinceVO.java
+10
-1
ScreenBack.java
src/main/java/com/gic/plug/web/vo/ScreenBack.java
+7
-1
ScreenBackVO.java
src/main/java/com/gic/plug/web/vo/ScreenBackVO.java
+12
-1
StoreDictVO.java
src/main/java/com/gic/plug/web/vo/StoreDictVO.java
+11
-1
StoreFieldRegionVO.java
src/main/java/com/gic/plug/web/vo/StoreFieldRegionVO.java
+6
-1
StoreFieldSelectVO.java
src/main/java/com/gic/plug/web/vo/StoreFieldSelectVO.java
+5
-0
StoreRegionVO.java
src/main/java/com/gic/plug/web/vo/StoreRegionVO.java
+5
-0
StoreResourceVO.java
src/main/java/com/gic/plug/web/vo/StoreResourceVO.java
+12
-0
StoreVO.java
src/main/java/com/gic/plug/web/vo/StoreVO.java
+5
-0
StoreWidgetVO.java
src/main/java/com/gic/plug/web/vo/StoreWidgetVO.java
+11
-1
CategoryVO.java
src/main/java/com/gic/plug/web/vo/goods/CategoryVO.java
+12
-1
GoodsBrandVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsBrandVO.java
+12
-1
GoodsCategoryVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsCategoryVO.java
+13
-2
GoodsChannelVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsChannelVO.java
+12
-1
GoodsCordVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsCordVO.java
+5
-0
GoodsDomainVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsDomainVO.java
+12
-1
GoodsPropertyVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsPropertyVO.java
+12
-1
GoodsPropertyValueVO.java
.../java/com/gic/plug/web/vo/goods/GoodsPropertyValueVO.java
+12
-1
GoodsRightsSelectorVO.java
...java/com/gic/plug/web/vo/goods/GoodsRightsSelectorVO.java
+12
-1
GoodsSelectorVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsSelectorVO.java
+12
-1
GoodsStandardVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsStandardVO.java
+12
-1
GoodsStandardValueGroupVO.java
.../com/gic/plug/web/vo/goods/GoodsStandardValueGroupVO.java
+12
-1
GoodsStandardValueVO.java
.../java/com/gic/plug/web/vo/goods/GoodsStandardValueVO.java
+12
-1
GoodsTagVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsTagVO.java
+5
-0
GoodsVO.java
src/main/java/com/gic/plug/web/vo/goods/GoodsVO.java
+10
-0
MallGoodsCordVO.java
src/main/java/com/gic/plug/web/vo/goods/MallGoodsCordVO.java
+12
-1
No files found.
src/main/java/com/gic/plug/web/controller/ProvincesController.java
View file @
258f273d
...
@@ -61,6 +61,7 @@ public class ProvincesController {
...
@@ -61,6 +61,7 @@ public class ProvincesController {
}
}
return
RestResponse
.
success
(
resultList
);
return
RestResponse
.
success
(
resultList
);
}
}
default
:
}
}
return
RestResponse
.
success
();
return
RestResponse
.
success
();
}
}
...
...
src/main/java/com/gic/plug/web/controller/ScreeningController.java
View file @
258f273d
...
@@ -24,12 +24,16 @@ import java.util.List;
...
@@ -24,12 +24,16 @@ import java.util.List;
/**
/**
*
* 门店表情
* @ClassName: ScreeningController
* @Description:
* @author boom
* @date 2020/9/14 10:36 AM
*/
*/
@Controller
@Controller
public
class
ScreeningController
{
public
class
ScreeningController
{
private
Logger
LOGGER
=
LogManager
.
getLogger
(
ScreeningController
.
class
);
private
static
final
Logger
LOGGER
=
LogManager
.
getLogger
(
ScreeningController
.
class
);
@Autowired
@Autowired
private
EsScreeningInitService
esScreeningInitService
;
private
EsScreeningInitService
esScreeningInitService
;
...
...
src/main/java/com/gic/plug/web/controller/StoreController.java
View file @
258f273d
...
@@ -110,7 +110,7 @@ public class StoreController {
...
@@ -110,7 +110,7 @@ public class StoreController {
storeSearchDTO
.
setEnterpriseId
(
enterpriseId
);
storeSearchDTO
.
setEnterpriseId
(
enterpriseId
);
storeSearchDTO
.
setSearchJson
(
storeWidgetCountQO
.
getSearchJson
());
storeSearchDTO
.
setSearchJson
(
storeWidgetCountQO
.
getSearchJson
());
storeSearchDTO
.
setAuthSearchJson
(
storeWidgetCountQO
.
getAuthSearchJson
());
storeSearchDTO
.
setAuthSearchJson
(
storeWidgetCountQO
.
getAuthSearchJson
());
ServiceResponse
<
Long
>
response
=
storeApiService
.
queryStoreCountFromE
S
(
storeSearchDTO
);
ServiceResponse
<
Long
>
response
=
storeApiService
.
queryStoreCountFromE
s
(
storeSearchDTO
);
return
RestResponse
.
success
(
response
.
getResult
());
return
RestResponse
.
success
(
response
.
getResult
());
}
}
...
...
src/main/java/com/gic/plug/web/controller/UploadImgController.java
View file @
258f273d
...
@@ -74,7 +74,7 @@ public class UploadImgController {
...
@@ -74,7 +74,7 @@ public class UploadImgController {
List
<
MultipartFile
>
list
=
multiRequest
.
getMultiFileMap
().
get
(
fileName
);
List
<
MultipartFile
>
list
=
multiRequest
.
getMultiFileMap
().
get
(
fileName
);
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
MultipartFile
mf
=
list
.
get
(
i
);
MultipartFile
mf
=
list
.
get
(
i
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
YYYY
MMddHHmmss"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
yyyy
MMddHHmmss"
);
//获得原始文件名;
//获得原始文件名;
String
fileRealName
=
mf
.
getOriginalFilename
();
String
fileRealName
=
mf
.
getOriginalFilename
();
//点号的位置
//点号的位置
...
@@ -121,7 +121,7 @@ public class UploadImgController {
...
@@ -121,7 +121,7 @@ public class UploadImgController {
public
static
File
multipartFileToFile
(
MultipartFile
file
)
throws
Exception
{
public
static
File
multipartFileToFile
(
MultipartFile
file
)
throws
Exception
{
File
toFile
=
null
;
File
toFile
=
null
;
if
(
file
.
equals
(
""
)
||
file
.
getSize
()
<=
0
)
{
if
(
""
.
equals
(
file
)
||
file
.
getSize
()
<=
0
)
{
file
=
null
;
file
=
null
;
}
else
{
}
else
{
InputStream
ins
=
null
;
InputStream
ins
=
null
;
...
...
src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java
View file @
258f273d
...
@@ -222,7 +222,18 @@ public class AppletConfigGoodsController extends BaseGoodsController {
...
@@ -222,7 +222,18 @@ public class AppletConfigGoodsController extends BaseGoodsController {
}
}
//type 1商城本体 2商品资料
/**
* type 1商城本体 2商品资料
* @param currentPage
* @param pageSize
* @param goodsDomainId
* @param shopId
* @param search
* @param channelCode
* @param queryObject
* @param type
* @return
*/
private
ServiceResponse
<
ESResponseQueryBatchDTO
>
searchGoods
(
Integer
currentPage
,
Integer
pageSize
,
private
ServiceResponse
<
ESResponseQueryBatchDTO
>
searchGoods
(
Integer
currentPage
,
Integer
pageSize
,
Long
goodsDomainId
,
Long
shopId
,
String
search
,
String
channelCode
,
Long
goodsDomainId
,
Long
shopId
,
String
search
,
String
channelCode
,
JSONObject
queryObject
,
int
type
)
{
JSONObject
queryObject
,
int
type
)
{
...
@@ -243,7 +254,7 @@ public class AppletConfigGoodsController extends BaseGoodsController {
...
@@ -243,7 +254,7 @@ public class AppletConfigGoodsController extends BaseGoodsController {
status
=
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
"status"
,
OperateEnum
.
OPERATE_EQ
,
2
);
status
=
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
"status"
,
OperateEnum
.
OPERATE_EQ
,
2
);
}
}
if
(
Constant
.
CHANNEL_CODE_MALL
.
equals
(
channelCode
))
{
if
(
Constant
.
CHANNEL_CODE_MALL
.
equals
(
channelCode
))
{
status
=
QueryConditionAssemblyUtil
.
addQueryNodeForSiblin
(
status
,
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
"upShelfTime"
,
OperateEnum
.
OPERATE_LTE
,
new
Date
().
getTime
()),
OperateEnum
.
OPERATE_AND
);
status
=
QueryConditionAssemblyUtil
.
addQueryNodeForSiblin
(
status
,
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
"upShelfTime"
,
OperateEnum
.
OPERATE_LTE
,
System
.
currentTimeMillis
()),
OperateEnum
.
OPERATE_AND
);
}
}
}
}
String
enterpriseId
=
getEnterpriseId
()
+
""
;
String
enterpriseId
=
getEnterpriseId
()
+
""
;
...
@@ -302,7 +313,6 @@ public class AppletConfigGoodsController extends BaseGoodsController {
...
@@ -302,7 +313,6 @@ public class AppletConfigGoodsController extends BaseGoodsController {
* @param cordId
* @param cordId
* @return 调试接口
* @return 调试接口
*/
*/
//@RequestMapping("list-integral-goods-selector")
public
RestResponse
listIntegralGoodsByChannel
(
@RequestParam
(
value
=
"currentPage"
,
defaultValue
=
"1"
)
Integer
currentPage
,
public
RestResponse
listIntegralGoodsByChannel
(
@RequestParam
(
value
=
"currentPage"
,
defaultValue
=
"1"
)
Integer
currentPage
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"20"
)
Integer
pageSize
,
String
appConfigId
,
Long
cordId
,
String
sortColumn
,
String
ids
,
Integer
proType
)
{
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"20"
)
Integer
pageSize
,
String
appConfigId
,
Long
cordId
,
String
sortColumn
,
String
ids
,
Integer
proType
)
{
...
...
src/main/java/com/gic/plug/web/controller/goods/BaseGoodsController.java
View file @
258f273d
...
@@ -3,7 +3,13 @@ package com.gic.plug.web.controller.goods;
...
@@ -3,7 +3,13 @@ package com.gic.plug.web.controller.goods;
import
com.gic.enterprise.base.EnterpriseInfo
;
import
com.gic.enterprise.base.EnterpriseInfo
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.mall.base.api.exception.GicMallException
;
import
com.gic.mall.base.api.exception.GicMallException
;
/**
* 商品
* @ClassName: BaseGoodsController
* @Description:
* @author guojuxing
* @date 2020/9/14 10:45 AM
*/
public
class
BaseGoodsController
{
public
class
BaseGoodsController
{
EnterpriseInfo
getLoginEnterpriseInfo
()
{
EnterpriseInfo
getLoginEnterpriseInfo
()
{
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsBrandController.java
View file @
258f273d
...
@@ -25,7 +25,13 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -25,7 +25,13 @@ import org.springframework.web.bind.annotation.RestController;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
/**
* 商品
* @ClassName: GoodsBrandController
* @Description:
* @author guojuxing
* @date 2020/9/14 10:43 AM
*/
@RestController
@RestController
public
class
GoodsBrandController
extends
BaseGoodsController
{
public
class
GoodsBrandController
extends
BaseGoodsController
{
...
@@ -55,14 +61,14 @@ public class GoodsBrandController extends BaseGoodsController {
...
@@ -55,14 +61,14 @@ public class GoodsBrandController extends BaseGoodsController {
}
else
{
}
else
{
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
ServiceResponse
<
GoodsRightsSelectorDTO
>
selectorD
TO
ServiceResponse
=
goodsRightsSelectorApiService
ServiceResponse
<
GoodsRightsSelectorDTO
>
selectorD
to
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
getEnterpriseId
()
.
getGoodsRightsSelector
(
resourceId
,
getEnterpriseId
()
,
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
,
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
if
(!
selectorD
TOServiceResponse
.
isSuccess
()
||
selectorDTO
ServiceResponse
.
getResult
()
==
null
||
if
(!
selectorD
toServiceResponse
.
isSuccess
()
||
selectorDto
ServiceResponse
.
getResult
()
==
null
||
selectorD
TO
ServiceResponse
.
getResult
().
getHasRights
()
==
Constant
.
NO
)
{
selectorD
to
ServiceResponse
.
getResult
().
getHasRights
()
==
Constant
.
NO
)
{
return
RestResponse
.
success
(
Collections
.
EMPTY_LIST
);
return
RestResponse
.
success
(
Collections
.
EMPTY_LIST
);
}
}
goodsRightsBrands
=
selectorD
TO
ServiceResponse
.
getResult
().
getGoodsRightsBrands
();
goodsRightsBrands
=
selectorD
to
ServiceResponse
.
getResult
().
getGoodsRightsBrands
();
}
}
// 是否最高权限
// 是否最高权限
List
<
Long
>
branIdList
=
new
ArrayList
<>();
List
<
Long
>
branIdList
=
new
ArrayList
<>();
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsCategoryController.java
View file @
258f273d
...
@@ -14,7 +14,13 @@ import org.springframework.web.bind.annotation.GetMapping;
...
@@ -14,7 +14,13 @@ import org.springframework.web.bind.annotation.GetMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
import
java.util.List
;
/**
* 商品
* @ClassName: GoodsCategoryController
* @Description:
* @author guojuxing
* @date 2020/9/14 10:44 AM
*/
@RestController
@RestController
public
class
GoodsCategoryController
extends
BaseGoodsController
{
public
class
GoodsCategoryController
extends
BaseGoodsController
{
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsController.java
View file @
258f273d
...
@@ -50,9 +50,9 @@ public class GoodsController extends BaseGoodsController {
...
@@ -50,9 +50,9 @@ public class GoodsController extends BaseGoodsController {
* @author xub
* @author xub
*/
*/
@GetMapping
(
"list-goods"
)
@GetMapping
(
"list-goods"
)
public
RestResponse
L
istGoods
(
@RequestParam
(
value
=
"currentPage"
,
defaultValue
=
"1"
)
Integer
currentPage
,
public
RestResponse
l
istGoods
(
@RequestParam
(
value
=
"currentPage"
,
defaultValue
=
"1"
)
Integer
currentPage
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"20"
)
Integer
pageSize
,
Long
goodsDomainId
,
String
search
,
String
channelCode
)
{
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"20"
)
Integer
pageSize
,
Long
goodsDomainId
,
String
search
,
String
channelCode
)
{
ServiceResponse
<
ESResponseQueryBatchDTO
>
serviceResponse
=
searchE
S
(
currentPage
,
pageSize
,
goodsDomainId
,
search
,
channelCode
);
ServiceResponse
<
ESResponseQueryBatchDTO
>
serviceResponse
=
searchE
s
(
currentPage
,
pageSize
,
goodsDomainId
,
search
,
channelCode
);
if
(
serviceResponse
.
isSuccess
())
{
if
(
serviceResponse
.
isSuccess
())
{
return
RestResponse
.
success
(
serviceResponse
.
getResult
());
return
RestResponse
.
success
(
serviceResponse
.
getResult
());
}
}
...
@@ -68,9 +68,9 @@ public class GoodsController extends BaseGoodsController {
...
@@ -68,9 +68,9 @@ public class GoodsController extends BaseGoodsController {
* @author xub
* @author xub
*/
*/
@GetMapping
(
"list-sku"
)
@GetMapping
(
"list-sku"
)
public
RestResponse
L
istSku
(
@RequestParam
(
value
=
"currentPage"
,
defaultValue
=
"1"
)
Integer
currentPage
,
public
RestResponse
l
istSku
(
@RequestParam
(
value
=
"currentPage"
,
defaultValue
=
"1"
)
Integer
currentPage
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"20"
)
Integer
pageSize
,
Long
goodsDomainId
,
String
search
,
String
channelCode
)
{
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"20"
)
Integer
pageSize
,
Long
goodsDomainId
,
String
search
,
String
channelCode
)
{
ServiceResponse
<
ESResponseQueryBatchDTO
>
serviceResponse
=
searchE
S
(
currentPage
,
pageSize
,
goodsDomainId
,
search
,
channelCode
);
ServiceResponse
<
ESResponseQueryBatchDTO
>
serviceResponse
=
searchE
s
(
currentPage
,
pageSize
,
goodsDomainId
,
search
,
channelCode
);
if
(!
serviceResponse
.
isSuccess
())
{
if
(!
serviceResponse
.
isSuccess
())
{
return
RestResponse
.
failure
(
serviceResponse
.
getCode
(),
serviceResponse
.
getMessage
());
return
RestResponse
.
failure
(
serviceResponse
.
getCode
(),
serviceResponse
.
getMessage
());
}
}
...
@@ -80,13 +80,13 @@ public class GoodsController extends BaseGoodsController {
...
@@ -80,13 +80,13 @@ public class GoodsController extends BaseGoodsController {
return
RestResponse
.
success
(
Collections
.
EMPTY_LIST
);
return
RestResponse
.
success
(
Collections
.
EMPTY_LIST
);
}
}
//1、获取商品信息
//1、获取商品信息
List
<
GoodsVO
>
goodsV
O
S
=
Lists
.
newArrayList
();
List
<
GoodsVO
>
goodsV
o
S
=
Lists
.
newArrayList
();
for
(
JSONObject
jsonObject
:
list
)
{
for
(
JSONObject
jsonObject
:
list
)
{
GoodsVO
goodsVO
=
JSONObject
.
toJavaObject
(
jsonObject
,
GoodsVO
.
class
);
GoodsVO
goodsVO
=
JSONObject
.
toJavaObject
(
jsonObject
,
GoodsVO
.
class
);
goodsV
O
S
.
add
(
goodsVO
);
goodsV
o
S
.
add
(
goodsVO
);
}
}
//2、获取商品ID信息
//2、获取商品ID信息
List
<
Long
>
goodsIds
=
goodsV
O
S
.
stream
().
mapToLong
(
GoodsVO:
:
getGoodsId
).
boxed
().
collect
(
Collectors
.
toList
());
List
<
Long
>
goodsIds
=
goodsV
o
S
.
stream
().
mapToLong
(
GoodsVO:
:
getGoodsId
).
boxed
().
collect
(
Collectors
.
toList
());
ServiceResponse
<
List
<
GoodsSkuDTO
>>
skuResponse
=
goodsApiService
.
listSku
(
goodsIds
,
channelCode
,
getEnterpriseId
());
ServiceResponse
<
List
<
GoodsSkuDTO
>>
skuResponse
=
goodsApiService
.
listSku
(
goodsIds
,
channelCode
,
getEnterpriseId
());
if
(!
skuResponse
.
isSuccess
())
{
if
(!
skuResponse
.
isSuccess
())
{
return
RestResponse
.
failure
(
skuResponse
.
getCode
(),
skuResponse
.
getMessage
());
return
RestResponse
.
failure
(
skuResponse
.
getCode
(),
skuResponse
.
getMessage
());
...
@@ -99,19 +99,19 @@ public class GoodsController extends BaseGoodsController {
...
@@ -99,19 +99,19 @@ public class GoodsController extends BaseGoodsController {
}
}
Map
<
Long
,
List
<
GoodsSkuDTO
>>
goodsIdAndskuDto
=
skuDTOList
.
stream
().
collect
(
Collectors
.
groupingBy
(
GoodsSkuDTO:
:
getGoodsId
));
Map
<
Long
,
List
<
GoodsSkuDTO
>>
goodsIdAndskuDto
=
skuDTOList
.
stream
().
collect
(
Collectors
.
groupingBy
(
GoodsSkuDTO:
:
getGoodsId
));
//4、商品信息中包含是sku信息
//4、商品信息中包含是sku信息
for
(
GoodsVO
goodsVO
:
goodsV
O
S
)
{
for
(
GoodsVO
goodsVO
:
goodsV
o
S
)
{
if
(
goodsIdAndskuDto
.
containsKey
(
goodsVO
.
getGoodsId
()))
{
if
(
goodsIdAndskuDto
.
containsKey
(
goodsVO
.
getGoodsId
()))
{
List
<
GoodsVO
.
SkuVO
>
skuVOList
=
EntityUtil
.
changeEntityListByOrika
(
GoodsVO
.
SkuVO
.
class
,
goodsIdAndskuDto
.
get
(
goodsVO
.
getGoodsId
()));
List
<
GoodsVO
.
SkuVO
>
skuVOList
=
EntityUtil
.
changeEntityListByOrika
(
GoodsVO
.
SkuVO
.
class
,
goodsIdAndskuDto
.
get
(
goodsVO
.
getGoodsId
()));
goodsVO
.
setSkuVOList
(
skuVOList
);
goodsVO
.
setSkuVOList
(
skuVOList
);
}
}
}
}
return
RestResponse
.
success
(
goodsV
O
S
);
return
RestResponse
.
success
(
goodsV
o
S
);
}
}
private
ServiceResponse
<
ESResponseQueryBatchDTO
>
searchE
S
(
Integer
currentPage
,
Integer
pageSize
,
Long
goodsDomainId
,
String
search
,
String
channelCode
)
{
private
ServiceResponse
<
ESResponseQueryBatchDTO
>
searchE
s
(
Integer
currentPage
,
Integer
pageSize
,
Long
goodsDomainId
,
String
search
,
String
channelCode
)
{
DynamicSearchDTO
searchDTO
=
new
DynamicSearchDTO
();
DynamicSearchDTO
searchDTO
=
new
DynamicSearchDTO
();
String
columnCategoryCode
=
Constant
.
ES_CODES_MAP
.
get
(
channelCode
);
String
columnCategoryCode
=
Constant
.
ES_CODES_MAP
.
get
(
channelCode
);
String
esName
=
esScreeningSearchService
.
getCurrentEsName
(
getEnterpriseId
()
+
""
,
columnCategoryCode
);
String
esName
=
esScreeningSearchService
.
getCurrentEsName
(
getEnterpriseId
()
+
""
,
columnCategoryCode
);
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsDomainController.java
View file @
258f273d
...
@@ -44,7 +44,7 @@ public class GoodsDomainController extends BaseGoodsController {
...
@@ -44,7 +44,7 @@ public class GoodsDomainController extends BaseGoodsController {
@RequestMapping
(
"/get-all-goods-domain-list-for-rights"
)
@RequestMapping
(
"/get-all-goods-domain-list-for-rights"
)
public
RestResponse
getAllGoodsDomainListForRights
()
{
public
RestResponse
getAllGoodsDomainListForRights
()
{
ServiceResponse
<
List
<
GoodsDomainDTO
>>
serviceResponse
=
goodsDomainApiService
ServiceResponse
<
List
<
GoodsDomainDTO
>>
serviceResponse
=
goodsDomainApiService
.
listAll
(
getEnterpriseId
(),
(
Integer
)
null
);
.
listAll
(
getEnterpriseId
(),
(
String
)
null
);
if
(!
serviceResponse
.
isSuccess
())
{
if
(!
serviceResponse
.
isSuccess
())
{
return
RestResponse
.
failure
(
serviceResponse
.
getCode
(),
serviceResponse
.
getMessage
());
return
RestResponse
.
failure
(
serviceResponse
.
getCode
(),
serviceResponse
.
getMessage
());
}
}
...
@@ -74,16 +74,16 @@ public class GoodsDomainController extends BaseGoodsController {
...
@@ -74,16 +74,16 @@ public class GoodsDomainController extends BaseGoodsController {
}
else
{
}
else
{
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
ServiceResponse
<
GoodsRightsSelectorDTO
>
selectorD
TO
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
ServiceResponse
<
GoodsRightsSelectorDTO
>
selectorD
to
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
if
(!
selectorD
TOServiceResponse
.
isSuccess
()
||
selectorDTO
ServiceResponse
.
getResult
()
==
null
||
if
(!
selectorD
toServiceResponse
.
isSuccess
()
||
selectorDto
ServiceResponse
.
getResult
()
==
null
||
selectorD
TO
ServiceResponse
.
getResult
().
getHasRights
()
==
Constant
.
NO
)
{
selectorD
to
ServiceResponse
.
getResult
().
getHasRights
()
==
Constant
.
NO
)
{
return
RestResponse
.
success
(
Collections
.
EMPTY_LIST
);
return
RestResponse
.
success
(
Collections
.
EMPTY_LIST
);
}
}
goodsDomian
=
selectorD
TO
ServiceResponse
.
getResult
().
getGoodsRightsDomains
();
goodsDomian
=
selectorD
to
ServiceResponse
.
getResult
().
getGoodsRightsDomains
();
hasRights
=
selectorD
TO
ServiceResponse
.
getResult
().
getHasRights
();
hasRights
=
selectorD
to
ServiceResponse
.
getResult
().
getHasRights
();
}
}
ServiceResponse
<
List
<
GoodsDomainDTO
>>
serviceResponse
=
goodsDomainApiService
.
listAll
(
getEnterpriseId
(),
(
Integer
)
null
);
ServiceResponse
<
List
<
GoodsDomainDTO
>>
serviceResponse
=
goodsDomainApiService
.
listAll
(
getEnterpriseId
(),
(
String
)
null
);
// 是否最高权限
// 是否最高权限
boolean
isHighestRights
=
true
;
boolean
isHighestRights
=
true
;
JSONObject
json
=
null
;
JSONObject
json
=
null
;
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsPropertyController.java
View file @
258f273d
...
@@ -18,7 +18,13 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -18,7 +18,13 @@ import org.springframework.web.bind.annotation.RestController;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
* 商品
* @ClassName: GoodsPropertyController
* @Description:
* @author guojuxing
* @date 2020/9/14 10:44 AM
*/
@RestController
@RestController
public
class
GoodsPropertyController
extends
BaseGoodsController
{
public
class
GoodsPropertyController
extends
BaseGoodsController
{
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsRightsSelectorController.java
View file @
258f273d
...
@@ -14,7 +14,13 @@ import org.apache.logging.log4j.Logger;
...
@@ -14,7 +14,13 @@ import org.apache.logging.log4j.Logger;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* 商品
* @ClassName: GoodsRightsSelectorController
* @Description:
* @author maj
* @date 2020/9/14 10:41 AM
*/
@RestController
@RestController
public
class
GoodsRightsSelectorController
extends
BaseGoodsController
{
public
class
GoodsRightsSelectorController
extends
BaseGoodsController
{
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java
View file @
258f273d
...
@@ -64,12 +64,12 @@ public class GoodsSelectorController extends BaseGoodsController {
...
@@ -64,12 +64,12 @@ public class GoodsSelectorController extends BaseGoodsController {
goodsSelectorDTO
.
setEnterpriseId
(
getEnterpriseId
());
goodsSelectorDTO
.
setEnterpriseId
(
getEnterpriseId
());
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
ServiceResponse
<
GoodsRightsSelectorDTO
>
goodsRightsSelectorD
TO
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
ServiceResponse
<
GoodsRightsSelectorDTO
>
goodsRightsSelectorD
to
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
if
(!
goodsRightsSelectorD
TO
ServiceResponse
.
isSuccess
())
{
if
(!
goodsRightsSelectorD
to
ServiceResponse
.
isSuccess
())
{
return
RestResponse
.
failure
(
goodsRightsSelectorD
TOServiceResponse
.
getCode
(),
goodsRightsSelectorDTO
ServiceResponse
.
getMessage
());
return
RestResponse
.
failure
(
goodsRightsSelectorD
toServiceResponse
.
getCode
(),
goodsRightsSelectorDto
ServiceResponse
.
getMessage
());
}
}
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
goodsRightsSelectorD
TO
ServiceResponse
.
getResult
();
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
goodsRightsSelectorD
to
ServiceResponse
.
getResult
();
goodsSelectorDTO
.
setHasRights
(
goodsRightsSelectorDTO
.
getHasRights
());
goodsSelectorDTO
.
setHasRights
(
goodsRightsSelectorDTO
.
getHasRights
());
goodsSelectorDTO
.
setGoodsSearchRightValue
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchValue
());
goodsSelectorDTO
.
setGoodsSearchRightValue
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchValue
());
goodsSelectorDTO
.
setGoodsSearchRightText
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchText
());
goodsSelectorDTO
.
setGoodsSearchRightText
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchText
());
...
@@ -90,12 +90,12 @@ public class GoodsSelectorController extends BaseGoodsController {
...
@@ -90,12 +90,12 @@ public class GoodsSelectorController extends BaseGoodsController {
goodsSelectorDTO
.
setEnterpriseId
(
getEnterpriseId
());
goodsSelectorDTO
.
setEnterpriseId
(
getEnterpriseId
());
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
ServiceResponse
<
GoodsRightsSelectorDTO
>
goodsRightsSelectorD
TO
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
ServiceResponse
<
GoodsRightsSelectorDTO
>
goodsRightsSelectorD
to
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
if
(!
goodsRightsSelectorD
TO
ServiceResponse
.
isSuccess
())
{
if
(!
goodsRightsSelectorD
to
ServiceResponse
.
isSuccess
())
{
return
RestResponse
.
failure
(
goodsRightsSelectorD
TOServiceResponse
.
getCode
(),
goodsRightsSelectorDTO
ServiceResponse
.
getMessage
());
return
RestResponse
.
failure
(
goodsRightsSelectorD
toServiceResponse
.
getCode
(),
goodsRightsSelectorDto
ServiceResponse
.
getMessage
());
}
}
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
goodsRightsSelectorD
TO
ServiceResponse
.
getResult
();
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
goodsRightsSelectorD
to
ServiceResponse
.
getResult
();
goodsSelectorDTO
.
setHasRights
(
goodsRightsSelectorDTO
.
getHasRights
());
goodsSelectorDTO
.
setHasRights
(
goodsRightsSelectorDTO
.
getHasRights
());
goodsSelectorDTO
.
setGoodsSearchRightValue
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchValue
());
goodsSelectorDTO
.
setGoodsSearchRightValue
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchValue
());
goodsSelectorDTO
.
setGoodsSearchRightText
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchText
());
goodsSelectorDTO
.
setGoodsSearchRightText
(
goodsRightsSelectorDTO
.
getGoodsRightsSearchText
());
...
@@ -126,19 +126,19 @@ public class GoodsSelectorController extends BaseGoodsController {
...
@@ -126,19 +126,19 @@ public class GoodsSelectorController extends BaseGoodsController {
}
}
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
Long
resourceId
=
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
==
null
?
null
:
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getGoodsResourceId
();
ServiceResponse
<
GoodsRightsSelectorDTO
>
goodsRightsSelectorD
TO
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
ServiceResponse
<
GoodsRightsSelectorDTO
>
goodsRightsSelectorD
to
ServiceResponse
=
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
resourceId
,
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
getEnterpriseId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
());
if
(!
goodsRightsSelectorD
TO
ServiceResponse
.
isSuccess
())
{
if
(!
goodsRightsSelectorD
to
ServiceResponse
.
isSuccess
())
{
return
RestResponse
.
failure
(
goodsRightsSelectorD
TOServiceResponse
.
getCode
(),
goodsRightsSelectorDTO
ServiceResponse
.
getMessage
());
return
RestResponse
.
failure
(
goodsRightsSelectorD
toServiceResponse
.
getCode
(),
goodsRightsSelectorDto
ServiceResponse
.
getMessage
());
}
}
if
(
goodsSelectorId
==
null
)
{
if
(
goodsSelectorId
==
null
)
{
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
new
GoodsRightsSelectorDTO
();
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
new
GoodsRightsSelectorDTO
();
goodsRightsSelectorDTO
.
setGoodsRightsSearchText
(
goodsRightsSelectorD
TO
ServiceResponse
.
getResult
().
getGoodsRightsSearchText
());
goodsRightsSelectorDTO
.
setGoodsRightsSearchText
(
goodsRightsSelectorD
to
ServiceResponse
.
getResult
().
getGoodsRightsSearchText
());
goodsRightsSelectorDTO
.
setGoodsRightsSearchValue
(
goodsRightsSelectorD
TO
ServiceResponse
.
getResult
().
getGoodsRightsSearchValue
());
goodsRightsSelectorDTO
.
setGoodsRightsSearchValue
(
goodsRightsSelectorD
to
ServiceResponse
.
getResult
().
getGoodsRightsSearchValue
());
goodsRightsSelectorDTO
.
setHasRights
(
goodsRightsSelectorD
TO
ServiceResponse
.
getResult
().
getHasRights
());
goodsRightsSelectorDTO
.
setHasRights
(
goodsRightsSelectorD
to
ServiceResponse
.
getResult
().
getHasRights
());
return
RestResponse
.
success
(
goodsRightsSelectorDTO
);
return
RestResponse
.
success
(
goodsRightsSelectorDTO
);
}
}
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
goodsRightsSelectorD
TO
ServiceResponse
.
getResult
();
GoodsRightsSelectorDTO
goodsRightsSelectorDTO
=
goodsRightsSelectorD
to
ServiceResponse
.
getResult
();
ServiceResponse
<
GoodsSelectorDTO
>
serviceResponse
=
goodsSelectorApiService
.
updateGoodsSelectorRights
(
goodsSelectorId
,
ServiceResponse
<
GoodsSelectorDTO
>
serviceResponse
=
goodsSelectorApiService
.
updateGoodsSelectorRights
(
goodsSelectorId
,
goodsRightsSelectorDTO
.
getGoodsRightsSearchText
(),
goodsRightsSelectorDTO
.
getGoodsRightsSearchValue
(),
goodsRightsSelectorDTO
.
getHasRights
(),
goodsRightsSelectorDTO
.
getGoodsRightsBrands
(),
goodsRightsSelectorDTO
.
getGoodsRightsDomains
(),
getEnterpriseId
());
goodsRightsSelectorDTO
.
getGoodsRightsSearchText
(),
goodsRightsSelectorDTO
.
getGoodsRightsSearchValue
(),
goodsRightsSelectorDTO
.
getHasRights
(),
goodsRightsSelectorDTO
.
getGoodsRightsBrands
(),
goodsRightsSelectorDTO
.
getGoodsRightsDomains
(),
getEnterpriseId
());
if
(!
serviceResponse
.
isSuccess
())
{
if
(!
serviceResponse
.
isSuccess
())
{
...
...
src/main/java/com/gic/plug/web/controller/goods/GoodsStandardController.java
View file @
258f273d
...
@@ -17,7 +17,13 @@ import com.gic.plug.web.vo.goods.GoodsStandardValueVO;
...
@@ -17,7 +17,13 @@ import com.gic.plug.web.vo.goods.GoodsStandardValueVO;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* 商品
* @ClassName: GoodsStandardController
* @Description:
* @author guojuxing
* @date 2020/9/14 10:44 AM
*/
@RestController
@RestController
public
class
GoodsStandardController
extends
BaseGoodsController
{
public
class
GoodsStandardController
extends
BaseGoodsController
{
...
...
src/main/java/com/gic/plug/web/qo/PageQO.java
View file @
258f273d
package
com
.
gic
.
store
.
web
.
qo
;
package
com
.
gic
.
plug
.
web
.
qo
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
...
src/main/java/com/gic/plug/web/qo/StoreWidgetCountQO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
qo
;
package
com
.
gic
.
plug
.
web
.
qo
;
import
java.io.Serializable
;
import
java.io.Serializable
;
/**
* 门店
* @ClassName: StoreWidgetCountQO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:45 AM
*/
public
class
StoreWidgetCountQO
implements
Serializable
{
public
class
StoreWidgetCountQO
implements
Serializable
{
private
String
authSearchJson
;
private
String
authSearchJson
;
private
String
searchJson
;
private
String
searchJson
;
...
...
src/main/java/com/gic/plug/web/qo/StoreWidgetQO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
qo
;
package
com
.
gic
.
plug
.
web
.
qo
;
import
java.io.Serializable
;
import
java.io.Serializable
;
/**
* 门店选择器
* @ClassName: StoreWidgetQO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:38 AM
*/
public
class
StoreWidgetQO
implements
Serializable
{
public
class
StoreWidgetQO
implements
Serializable
{
private
Integer
storeWidgetId
;
private
Integer
storeWidgetId
;
private
String
authSearchParam
;
private
String
authSearchParam
;
...
...
src/main/java/com/gic/plug/web/qo/goods/GoodsQO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
/**
* test
* @ClassName: GoodsQO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsQO
{
public
class
GoodsQO
{
}
}
src/main/java/com/gic/plug/web/qo/goods/GoodsRightsSelectorSaveQO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
/**
* 商品
* @ClassName: GoodsRightsSelectorSaveQO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:39 AM
*/
public
class
GoodsRightsSelectorSaveQO
{
public
class
GoodsRightsSelectorSaveQO
{
/**
/**
...
...
src/main/java/com/gic/plug/web/qo/goods/GoodsRightsSelectorUpdateQO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
/**
* 商品
* @ClassName: GoodsRightsSelectorUpdateQO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:39 AM
*/
public
class
GoodsRightsSelectorUpdateQO
{
public
class
GoodsRightsSelectorUpdateQO
{
/**
/**
...
...
src/main/java/com/gic/plug/web/qo/goods/GoodsSelectorSaveQO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
/**
* 商品
* @ClassName: GoodsSelectorSaveQO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:39 AM
*/
public
class
GoodsSelectorSaveQO
{
public
class
GoodsSelectorSaveQO
{
private
String
goodsSearchValue
;
private
String
goodsSearchValue
;
...
...
src/main/java/com/gic/plug/web/qo/goods/GoodsSelectorUpdateQO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
package
com
.
gic
.
plug
.
web
.
qo
.
goods
;
/**
* 商品
* @ClassName: GoodsSelectorUpdateQO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:39 AM
*/
public
class
GoodsSelectorUpdateQO
{
public
class
GoodsSelectorUpdateQO
{
private
Long
goodsSelectorId
;
private
Long
goodsSelectorId
;
...
...
src/main/java/com/gic/plug/web/strategy/ScreenBackStrategy.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
strategy
;
package
com
.
gic
.
plug
.
web
.
strategy
;
import
com.gic.plug.web.vo.ScreenBack
;
import
com.gic.plug.web.vo.ScreenBack
;
/**
* 回显
* @ClassName: ScreenBackStrategy
* @Description:
* @author guojuxing
* @date 2020/9/14 10:36 AM
*/
public
interface
ScreenBackStrategy
{
public
interface
ScreenBackStrategy
{
ScreenBack
screenBack
(
String
compute
,
String
value
,
String
key
,
Integer
enterpriseId
)
throws
ClassNotFoundException
;
ScreenBack
screenBack
(
String
compute
,
String
value
,
String
key
,
Integer
enterpriseId
)
throws
ClassNotFoundException
;
}
}
src/main/java/com/gic/plug/web/strategy/impl/StoreAreaBackImpl.java
View file @
258f273d
...
@@ -15,7 +15,13 @@ import org.springframework.stereotype.Component;
...
@@ -15,7 +15,13 @@ import org.springframework.stereotype.Component;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店
* @ClassName: StoreAreaBackImpl
* @Description:
* @author boom
* @date 2020/9/14 10:40 AM
*/
@Component
@Component
public
class
StoreAreaBackImpl
implements
ScreenBackStrategy
{
public
class
StoreAreaBackImpl
implements
ScreenBackStrategy
{
@Autowired
@Autowired
...
...
src/main/java/com/gic/plug/web/strategy/impl/StoreBackImpl.java
View file @
258f273d
...
@@ -17,7 +17,13 @@ import org.springframework.stereotype.Component;
...
@@ -17,7 +17,13 @@ import org.springframework.stereotype.Component;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店回显
* @ClassName: StoreBackImpl
* @Description:
* @author boom
* @date 2020/9/14 10:41 AM
*/
@Component
@Component
public
class
StoreBackImpl
implements
ScreenBackStrategy
{
public
class
StoreBackImpl
implements
ScreenBackStrategy
{
@Autowired
@Autowired
...
...
src/main/java/com/gic/plug/web/strategy/impl/StoreBrandBackImpl.java
View file @
258f273d
...
@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
...
@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店品牌
* @ClassName: StoreBrandBackImpl
* @Description:
* @author boom
* @date 2020/9/14 10:40 AM
*/
@Component
@Component
public
class
StoreBrandBackImpl
implements
ScreenBackStrategy
{
public
class
StoreBrandBackImpl
implements
ScreenBackStrategy
{
@Autowired
@Autowired
...
...
src/main/java/com/gic/plug/web/strategy/impl/StoreCustomBackImpl.java
View file @
258f273d
...
@@ -113,12 +113,12 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
...
@@ -113,12 +113,12 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
}
}
ServiceResponse
<
List
<
StoreFieldSelectDTO
>>
listServiceResponse
=
this
.
storeFieldSelectApiService
.
listStoreFieldSelectByIds
(
enterpriseId
,
list
);
ServiceResponse
<
List
<
StoreFieldSelectDTO
>>
listServiceResponse
=
this
.
storeFieldSelectApiService
.
listStoreFieldSelectByIds
(
enterpriseId
,
list
);
if
(
listServiceResponse
.
isSuccess
())
{
if
(
listServiceResponse
.
isSuccess
())
{
List
<
StoreFieldSelectDTO
>
selectD
TO
S
=
listServiceResponse
.
getResult
();
List
<
StoreFieldSelectDTO
>
selectD
to
S
=
listServiceResponse
.
getResult
();
List
<
String
>
view
=
new
ArrayList
<>();
List
<
String
>
view
=
new
ArrayList
<>();
List
<
String
>
hideView
=
new
ArrayList
<>();
List
<
String
>
hideView
=
new
ArrayList
<>();
int
index
=
0
;
int
index
=
0
;
if
(
CollectionUtils
.
isNotEmpty
(
selectD
TO
S
))
{
if
(
CollectionUtils
.
isNotEmpty
(
selectD
to
S
))
{
for
(
StoreFieldSelectDTO
dto
:
selectD
TO
S
)
{
for
(
StoreFieldSelectDTO
dto
:
selectD
to
S
)
{
if
(
index
<
5
){
if
(
index
<
5
){
view
.
add
(
dto
.
getStoreFieldSelectName
());
view
.
add
(
dto
.
getStoreFieldSelectName
());
}
else
{
}
else
{
...
@@ -150,31 +150,31 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
...
@@ -150,31 +150,31 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
return
screenBack
;
return
screenBack
;
}
}
public
String
y
yyyMMddHHmmss
Back
(
String
value
)
throws
ParseException
{
public
String
y
earMonthDateHourMinuteSecond
Back
(
String
value
)
throws
ParseException
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
);
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
}
}
public
String
y
yyyMMdd
Back
(
String
value
)
throws
ParseException
{
public
String
y
earMonthDate
Back
(
String
value
)
throws
ParseException
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
}
}
public
String
y
yyyMM
(
String
value
)
throws
ParseException
{
public
String
y
earMonth
(
String
value
)
throws
ParseException
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyyMM"
);
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyyMM"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"yyyy-MM"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"yyyy-MM"
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
}
}
public
String
m
mdd
Back
(
String
value
)
throws
ParseException
{
public
String
m
onthDate
Back
(
String
value
)
throws
ParseException
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"MMdd"
);
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"MMdd"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"MM-dd"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"MM-dd"
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
}
}
public
String
h
hmmss
Back
(
String
value
)
throws
ParseException
{
public
String
h
ourMinuteSecond
Back
(
String
value
)
throws
ParseException
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"HHmmss"
);
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"HHmmss"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"HH:mm:ss"
);
SimpleDateFormat
simpleDateFormat1
=
new
SimpleDateFormat
(
"HH:mm:ss"
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
return
this
.
dateBack
(
value
,
simpleDateFormat
,
simpleDateFormat1
);
...
...
src/main/java/com/gic/plug/web/strategy/impl/StoreGroupBackImpl.java
View file @
258f273d
...
@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
...
@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店分组回显
* @ClassName: StoreGroupBackImpl
* @Description:
* @author boom
* @date 2020/9/14 10:40 AM
*/
@Component
@Component
public
class
StoreGroupBackImpl
implements
ScreenBackStrategy
{
public
class
StoreGroupBackImpl
implements
ScreenBackStrategy
{
@Autowired
@Autowired
...
...
src/main/java/com/gic/plug/web/strategy/impl/StoreRegionBackImpl.java
View file @
258f273d
...
@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
...
@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店域回显
* @ClassName: StoreRegionBackImpl
* @Description:
* @author boom
* @date 2020/9/14 10:40 AM
*/
@Component
@Component
public
class
StoreRegionBackImpl
implements
ScreenBackStrategy
{
public
class
StoreRegionBackImpl
implements
ScreenBackStrategy
{
@Autowired
@Autowired
...
...
src/main/java/com/gic/plug/web/strategy/impl/StoreTagBackImpl.java
View file @
258f273d
...
@@ -14,7 +14,13 @@ import org.springframework.stereotype.Component;
...
@@ -14,7 +14,13 @@ import org.springframework.stereotype.Component;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店表情
* @ClassName: StoreTagBackImpl
* @Description:
* @author boom
* @date 2020/9/14 10:39 AM
*/
@Component
@Component
public
class
StoreTagBackImpl
implements
ScreenBackStrategy
{
public
class
StoreTagBackImpl
implements
ScreenBackStrategy
{
@Autowired
@Autowired
...
...
src/main/java/com/gic/plug/web/strategy/init/StrategyInit.java
View file @
258f273d
...
@@ -9,7 +9,13 @@ import org.springframework.stereotype.Component;
...
@@ -9,7 +9,13 @@ import org.springframework.stereotype.Component;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PostConstruct
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
/**
* 回显
* @ClassName: StrategyInit
* @Description:
* @author boom
* @date 2020/9/14 10:41 AM
*/
@Component
@Component
public
class
StrategyInit
{
public
class
StrategyInit
{
@Autowired
@Autowired
...
...
src/main/java/com/gic/plug/web/utils/ComputeBackUtil.java
View file @
258f273d
...
@@ -4,7 +4,13 @@ import org.apache.commons.lang.StringUtils;
...
@@ -4,7 +4,13 @@ import org.apache.commons.lang.StringUtils;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
/**
* 符号
* @ClassName: ComputeBackUtil
* @Description:
* @author guojuxing
* @date 2020/9/14 10:39 AM
*/
public
class
ComputeBackUtil
{
public
class
ComputeBackUtil
{
public
static
Map
<
String
,
String
>
computeMap
=
new
HashMap
<>();
public
static
Map
<
String
,
String
>
computeMap
=
new
HashMap
<>();
static
{
static
{
...
...
src/main/java/com/gic/plug/web/utils/StoreRegionAuthUtil.java
View file @
258f273d
...
@@ -13,7 +13,13 @@ import org.apache.commons.collections.CollectionUtils;
...
@@ -13,7 +13,13 @@ import org.apache.commons.collections.CollectionUtils;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
java.util.Set
;
import
java.util.Set
;
/**
* 门店
* @ClassName: StoreRegionAuthUtil
* @Description:
* @author guojuxing
* @date 2020/9/14 10:45 AM
*/
public
class
StoreRegionAuthUtil
{
public
class
StoreRegionAuthUtil
{
public
static
Set
<
String
>
getUserRegion
(
StoreWidgetApiService
storeWidgetApiService
){
public
static
Set
<
String
>
getUserRegion
(
StoreWidgetApiService
storeWidgetApiService
){
Set
<
String
>
authRegionSet
=
new
HashSet
<>();
Set
<
String
>
authRegionSet
=
new
HashSet
<>();
...
...
src/main/java/com/gic/plug/web/vo/CityVO.java
View file @
258f273d
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
* tab_city
* 城市
* @ClassName: CityVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:38 AM
*/
*/
public
class
CityVO
implements
Serializable
{
public
class
CityVO
implements
Serializable
{
/**
/**
...
@@ -60,4 +64,8 @@ public class CityVO implements Serializable {
...
@@ -60,4 +64,8 @@ public class CityVO implements Serializable {
this
.
cityPy
=
cityPy
;
this
.
cityPy
=
cityPy
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/CountyVO.java
View file @
258f273d
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
* tab_county
* 地区
* @ClassName: CountyVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:37 AM
*/
*/
public
class
CountyVO
implements
Serializable
{
public
class
CountyVO
implements
Serializable
{
/**
/**
...
@@ -86,4 +90,9 @@ public class CountyVO implements Serializable {
...
@@ -86,4 +90,9 @@ public class CountyVO implements Serializable {
public
void
setCountyPy
(
String
countyPy
)
{
public
void
setCountyPy
(
String
countyPy
)
{
this
.
countyPy
=
countyPy
;
this
.
countyPy
=
countyPy
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/ProvinceVO.java
View file @
258f273d
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
* tab_province
* 省
* @ClassName: ProvinceVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:38 AM
*/
*/
public
class
ProvinceVO
implements
Serializable
{
public
class
ProvinceVO
implements
Serializable
{
/**
/**
...
@@ -47,4 +51,8 @@ public class ProvinceVO implements Serializable {
...
@@ -47,4 +51,8 @@ public class ProvinceVO implements Serializable {
this
.
provincePy
=
provincePy
;
this
.
provincePy
=
provincePy
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/ScreenBack.java
View file @
258f273d
...
@@ -2,7 +2,13 @@ package com.gic.plug.web.vo;
...
@@ -2,7 +2,13 @@ package com.gic.plug.web.vo;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店
* @ClassName: ScreenBack
* @Description:
* @author guojuxing
* @date 2020/9/14 10:45 AM
*/
public
class
ScreenBack
implements
Serializable
{
public
class
ScreenBack
implements
Serializable
{
private
String
title
;
private
String
title
;
private
String
compute
;
private
String
compute
;
...
...
src/main/java/com/gic/plug/web/vo/ScreenBackVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
;
package
com
.
gic
.
plug
.
web
.
vo
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店
* @ClassName: ScreenBackVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:45 AM
*/
public
class
ScreenBackVO
{
public
class
ScreenBackVO
{
private
String
type
=
"and"
;
private
String
type
=
"and"
;
private
List
<
ScreenBack
>
data
;
private
List
<
ScreenBack
>
data
;
...
@@ -21,4 +27,9 @@ public class ScreenBackVO {
...
@@ -21,4 +27,9 @@ public class ScreenBackVO {
public
void
setData
(
List
<
ScreenBack
>
data
)
{
public
void
setData
(
List
<
ScreenBack
>
data
)
{
this
.
data
=
data
;
this
.
data
=
data
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/StoreDictVO.java
View file @
258f273d
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
...
@@ -4,7 +4,11 @@ import java.io.Serializable;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
* tab_store_dict
* 门店字典
* @ClassName: StoreDictVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:38 AM
*/
*/
public
class
StoreDictVO
implements
Serializable
{
public
class
StoreDictVO
implements
Serializable
{
private
String
value
;
private
String
value
;
...
@@ -37,4 +41,9 @@ public class StoreDictVO implements Serializable {
...
@@ -37,4 +41,9 @@ public class StoreDictVO implements Serializable {
public
void
setKey
(
String
key
)
{
public
void
setKey
(
String
key
)
{
this
.
key
=
key
;
this
.
key
=
key
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/StoreFieldRegionVO.java
View file @
258f273d
...
@@ -24,7 +24,7 @@ public class StoreFieldRegionVO implements Serializable{
...
@@ -24,7 +24,7 @@ public class StoreFieldRegionVO implements Serializable{
private
String
storeFieldKey
;
private
String
storeFieldKey
;
private
int
dateType
;
private
Integer
dateType
=
0
;
/**
/**
* 排序
* 排序
...
@@ -86,4 +86,9 @@ public class StoreFieldRegionVO implements Serializable{
...
@@ -86,4 +86,9 @@ public class StoreFieldRegionVO implements Serializable{
public
void
setDateType
(
int
dateType
)
{
public
void
setDateType
(
int
dateType
)
{
this
.
dateType
=
dateType
;
this
.
dateType
=
dateType
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/StoreFieldSelectVO.java
View file @
258f273d
...
@@ -48,4 +48,9 @@ public class StoreFieldSelectVO implements Serializable{
...
@@ -48,4 +48,9 @@ public class StoreFieldSelectVO implements Serializable{
public
void
setSort
(
Double
sort
)
{
public
void
setSort
(
Double
sort
)
{
this
.
sort
=
sort
;
this
.
sort
=
sort
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/StoreRegionVO.java
View file @
258f273d
...
@@ -36,4 +36,9 @@ public class StoreRegionVO implements Serializable {
...
@@ -36,4 +36,9 @@ public class StoreRegionVO implements Serializable {
public
void
setRegionName
(
String
regionName
)
{
public
void
setRegionName
(
String
regionName
)
{
this
.
regionName
=
regionName
;
this
.
regionName
=
regionName
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/StoreResourceVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
;
package
com
.
gic
.
plug
.
web
.
vo
;
import
java.util.List
;
import
java.util.List
;
/**
* 门店
* @ClassName: StoreResourceVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:44 AM
*/
public
class
StoreResourceVO
{
public
class
StoreResourceVO
{
private
Integer
authMode
;
private
Integer
authMode
;
private
String
searchJson
;
private
String
searchJson
;
...
@@ -28,4 +35,9 @@ public class StoreResourceVO {
...
@@ -28,4 +35,9 @@ public class StoreResourceVO {
public
void
setSceenBack
(
List
<
ScreenBackVO
>
sceenBack
)
{
public
void
setSceenBack
(
List
<
ScreenBackVO
>
sceenBack
)
{
this
.
sceenBack
=
sceenBack
;
this
.
sceenBack
=
sceenBack
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/StoreVO.java
View file @
258f273d
...
@@ -35,4 +35,9 @@ public class StoreVO implements Serializable {
...
@@ -35,4 +35,9 @@ public class StoreVO implements Serializable {
public
void
setStoreCode
(
String
storeCode
)
{
public
void
setStoreCode
(
String
storeCode
)
{
this
.
storeCode
=
storeCode
;
this
.
storeCode
=
storeCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/StoreWidgetVO.java
View file @
258f273d
...
@@ -3,7 +3,11 @@ package com.gic.plug.web.vo;
...
@@ -3,7 +3,11 @@ package com.gic.plug.web.vo;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.List
;
/**
/**
* tab_store_widget
* 商品
* @ClassName: StoreWidgetVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:45 AM
*/
*/
public
class
StoreWidgetVO
implements
Serializable
{
public
class
StoreWidgetVO
implements
Serializable
{
/**
/**
...
@@ -73,4 +77,9 @@ public class StoreWidgetVO implements Serializable {
...
@@ -73,4 +77,9 @@ public class StoreWidgetVO implements Serializable {
public
void
setScreenBack
(
List
<
ScreenBackVO
>
screenBack
)
{
public
void
setScreenBack
(
List
<
ScreenBackVO
>
screenBack
)
{
this
.
screenBack
=
screenBack
;
this
.
screenBack
=
screenBack
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/goods/CategoryVO.java
View file @
258f273d
...
@@ -4,7 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
...
@@ -4,7 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
/**
* 字典
* @ClassName: CategoryVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:38 AM
*/
public
class
CategoryVO
implements
Serializable
{
public
class
CategoryVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
8126896401928702304L
;
private
static
final
long
serialVersionUID
=
-
8126896401928702304L
;
...
@@ -207,4 +213,9 @@ public class CategoryVO implements Serializable {
...
@@ -207,4 +213,9 @@ public class CategoryVO implements Serializable {
public
void
setNextChild
(
Boolean
nextChild
)
{
public
void
setNextChild
(
Boolean
nextChild
)
{
this
.
nextChild
=
nextChild
;
this
.
nextChild
=
nextChild
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsBrandVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsBrandVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsBrandVO
{
public
class
GoodsBrandVO
{
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
...
@@ -34,4 +40,9 @@ public class GoodsBrandVO {
...
@@ -34,4 +40,9 @@ public class GoodsBrandVO {
public
void
setBrandCode
(
String
brandCode
)
{
public
void
setBrandCode
(
String
brandCode
)
{
this
.
brandCode
=
brandCode
;
this
.
brandCode
=
brandCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsCategoryVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
/**
* 商品
* @ClassName: GoodsCategoryVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:43 AM
*/
public
class
GoodsCategoryVO
{
public
class
GoodsCategoryVO
{
/**
/**
...
@@ -17,7 +23,7 @@ public class GoodsCategoryVO {
...
@@ -17,7 +23,7 @@ public class GoodsCategoryVO {
*/
*/
private
String
specCategoryCode
;
private
String
specCategoryCode
;
private
boolean
hasChild
;
private
Boolean
hasChild
=
false
;
public
Long
getSpecCategoryId
()
{
public
Long
getSpecCategoryId
()
{
return
specCategoryId
;
return
specCategoryId
;
...
@@ -50,4 +56,9 @@ public class GoodsCategoryVO {
...
@@ -50,4 +56,9 @@ public class GoodsCategoryVO {
public
void
setHasChild
(
boolean
hasChild
)
{
public
void
setHasChild
(
boolean
hasChild
)
{
this
.
hasChild
=
hasChild
;
this
.
hasChild
=
hasChild
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsChannelVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
java.util.List
;
import
java.util.List
;
/**
* 商品
* @ClassName: GoodsChannelVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsChannelVO
{
public
class
GoodsChannelVO
{
private
String
channelCode
;
private
String
channelCode
;
...
@@ -43,4 +49,9 @@ public class GoodsChannelVO {
...
@@ -43,4 +49,9 @@ public class GoodsChannelVO {
public
void
setSceneCode
(
String
sceneCode
)
{
public
void
setSceneCode
(
String
sceneCode
)
{
this
.
sceneCode
=
sceneCode
;
this
.
sceneCode
=
sceneCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsCordVO.java
View file @
258f273d
...
@@ -135,4 +135,8 @@ public class GoodsCordVO {
...
@@ -135,4 +135,8 @@ public class GoodsCordVO {
this
.
sort
=
sort
;
this
.
sort
=
sort
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/goods/GoodsDomainVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsDomainVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsDomainVO
{
public
class
GoodsDomainVO
{
private
String
domainCode
;
private
String
domainCode
;
...
@@ -34,4 +40,9 @@ public class GoodsDomainVO {
...
@@ -34,4 +40,9 @@ public class GoodsDomainVO {
public
void
setDomainId
(
Long
domainId
)
{
public
void
setDomainId
(
Long
domainId
)
{
this
.
domainId
=
domainId
;
this
.
domainId
=
domainId
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsPropertyVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsPropertyVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:44 AM
*/
public
class
GoodsPropertyVO
{
public
class
GoodsPropertyVO
{
/**
/**
...
@@ -70,4 +76,9 @@ public class GoodsPropertyVO {
...
@@ -70,4 +76,9 @@ public class GoodsPropertyVO {
public
void
setPoints
(
Integer
points
)
{
public
void
setPoints
(
Integer
points
)
{
this
.
points
=
points
;
this
.
points
=
points
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsPropertyValueVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsPropertyValueVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:44 AM
*/
public
class
GoodsPropertyValueVO
{
public
class
GoodsPropertyValueVO
{
/**
/**
*
*
...
@@ -42,4 +48,9 @@ public class GoodsPropertyValueVO {
...
@@ -42,4 +48,9 @@ public class GoodsPropertyValueVO {
public
void
setSpecPropertyValueCode
(
String
specPropertyValueCode
)
{
public
void
setSpecPropertyValueCode
(
String
specPropertyValueCode
)
{
this
.
specPropertyValueCode
=
specPropertyValueCode
;
this
.
specPropertyValueCode
=
specPropertyValueCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsRightsSelectorVO.java
View file @
258f273d
...
@@ -3,7 +3,13 @@ package com.gic.plug.web.vo.goods;
...
@@ -3,7 +3,13 @@ package com.gic.plug.web.vo.goods;
import
java.util.Date
;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsRightsSelectorVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsRightsSelectorVO
{
public
class
GoodsRightsSelectorVO
{
/**
/**
*
*
...
@@ -158,4 +164,9 @@ public class GoodsRightsSelectorVO {
...
@@ -158,4 +164,9 @@ public class GoodsRightsSelectorVO {
public
void
setFindCount
(
Long
findCount
)
{
public
void
setFindCount
(
Long
findCount
)
{
this
.
findCount
=
findCount
;
this
.
findCount
=
findCount
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsSelectorVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsSelectorVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsSelectorVO
{
public
class
GoodsSelectorVO
{
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
...
@@ -110,4 +116,9 @@ public class GoodsSelectorVO {
...
@@ -110,4 +116,9 @@ public class GoodsSelectorVO {
public
void
setHasRights
(
Integer
hasRights
)
{
public
void
setHasRights
(
Integer
hasRights
)
{
this
.
hasRights
=
hasRights
;
this
.
hasRights
=
hasRights
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsStandardVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsStandardVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:43 AM
*/
public
class
GoodsStandardVO
{
public
class
GoodsStandardVO
{
/**
/**
...
@@ -43,4 +49,9 @@ public class GoodsStandardVO {
...
@@ -43,4 +49,9 @@ public class GoodsStandardVO {
public
void
setSpecStandardCode
(
String
specStandardCode
)
{
public
void
setSpecStandardCode
(
String
specStandardCode
)
{
this
.
specStandardCode
=
specStandardCode
;
this
.
specStandardCode
=
specStandardCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsStandardValueGroupVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsStandardValueGroupVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsStandardValueGroupVO
{
public
class
GoodsStandardValueGroupVO
{
/**
/**
*
*
...
@@ -42,4 +48,9 @@ public class GoodsStandardValueGroupVO {
...
@@ -42,4 +48,9 @@ public class GoodsStandardValueGroupVO {
public
void
setSpecStandardValueGroupCode
(
String
specStandardValueGroupCode
)
{
public
void
setSpecStandardValueGroupCode
(
String
specStandardValueGroupCode
)
{
this
.
specStandardValueGroupCode
=
specStandardValueGroupCode
;
this
.
specStandardValueGroupCode
=
specStandardValueGroupCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsStandardValueVO.java
View file @
258f273d
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
package
com
.
gic
.
plug
.
web
.
vo
.
goods
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: GoodsStandardValueVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:42 AM
*/
public
class
GoodsStandardValueVO
{
public
class
GoodsStandardValueVO
{
/**
/**
...
@@ -43,4 +49,9 @@ public class GoodsStandardValueVO {
...
@@ -43,4 +49,9 @@ public class GoodsStandardValueVO {
public
void
setSpecStandardValueCode
(
String
specStandardValueCode
)
{
public
void
setSpecStandardValueCode
(
String
specStandardValueCode
)
{
this
.
specStandardValueCode
=
specStandardValueCode
;
this
.
specStandardValueCode
=
specStandardValueCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
src/main/java/com/gic/plug/web/vo/goods/GoodsTagVO.java
View file @
258f273d
...
@@ -73,4 +73,8 @@ public class GoodsTagVO {
...
@@ -73,4 +73,8 @@ public class GoodsTagVO {
this
.
specTagCode
=
specTagCode
;
this
.
specTagCode
=
specTagCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/goods/GoodsVO.java
View file @
258f273d
...
@@ -116,6 +116,15 @@ public class GoodsVO {
...
@@ -116,6 +116,15 @@ public class GoodsVO {
public
void
setGoodsSkuCode
(
String
goodsSkuCode
)
{
public
void
setGoodsSkuCode
(
String
goodsSkuCode
)
{
this
.
goodsSkuCode
=
goodsSkuCode
;
this
.
goodsSkuCode
=
goodsSkuCode
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
\ No newline at end of file
src/main/java/com/gic/plug/web/vo/goods/MallGoodsCordVO.java
View file @
258f273d
...
@@ -3,7 +3,13 @@ package com.gic.plug.web.vo.goods;
...
@@ -3,7 +3,13 @@ package com.gic.plug.web.vo.goods;
import
java.util.List
;
import
java.util.List
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* 商品
* @ClassName: MallGoodsCordVO
* @Description:
* @author guojuxing
* @date 2020/9/14 10:44 AM
*/
public
class
MallGoodsCordVO
{
public
class
MallGoodsCordVO
{
/**
/**
...
@@ -138,4 +144,9 @@ public class MallGoodsCordVO {
...
@@ -138,4 +144,9 @@ public class MallGoodsCordVO {
public
void
setChildSpecCordDTOList
(
List
<
MallGoodsCordVO
>
childSpecCordDTOList
)
{
public
void
setChildSpecCordDTOList
(
List
<
MallGoodsCordVO
>
childSpecCordDTOList
)
{
this
.
childSpecCordDTOList
=
childSpecCordDTOList
;
this
.
childSpecCordDTOList
=
childSpecCordDTOList
;
}
}
@Override
public
String
toString
()
{
return
super
.
toString
();
}
}
}
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