Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
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-store
Commits
1c2cdd99
Commit
1c2cdd99
authored
Jul 01, 2019
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
门店基础查询(不包含自定义属性)
parent
1f63619a
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
1419 additions
and
24 deletions
+1419
-24
StoreBusinessTimeDTO.java
...src/main/java/com/gic/store/dto/StoreBusinessTimeDTO.java
+66
-0
StoreDTO.java
gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java
+290
-0
StorePhotoDTO.java
...re-api/src/main/java/com/gic/store/dto/StorePhotoDTO.java
+77
-0
StoreApiService.java
.../src/main/java/com/gic/store/service/StoreApiService.java
+2
-1
StoreBrandApiService.java
...main/java/com/gic/store/service/StoreBrandApiService.java
+1
-1
TabStoreBrandMapper.java
...in/java/com/gic/store/dao/mapper/TabStoreBrandMapper.java
+3
-0
TabStoreBusinessTimeMapper.java
.../com/gic/store/dao/mapper/TabStoreBusinessTimeMapper.java
+5
-0
TabStoreMapper.java
...rc/main/java/com/gic/store/dao/mapper/TabStoreMapper.java
+8
-0
TabStorePhotoMapper.java
...in/java/com/gic/store/dao/mapper/TabStorePhotoMapper.java
+6
-0
TabStore.java
...-service/src/main/java/com/gic/store/entity/TabStore.java
+52
-0
TabStorePhoto.java
...ice/src/main/java/com/gic/store/entity/TabStorePhoto.java
+13
-0
StoreBrandService.java
...rc/main/java/com/gic/store/service/StoreBrandService.java
+3
-1
StoreBusinessTimeService.java
.../java/com/gic/store/service/StoreBusinessTimeService.java
+16
-0
StorePhotoService.java
...rc/main/java/com/gic/store/service/StorePhotoService.java
+16
-0
StoreService.java
...ice/src/main/java/com/gic/store/service/StoreService.java
+43
-0
StoreBrandServiceImpl.java
...ava/com/gic/store/service/impl/StoreBrandServiceImpl.java
+12
-4
StoreBusinessTimeServiceImpl.java
.../gic/store/service/impl/StoreBusinessTimeServiceImpl.java
+47
-0
StorePhotoServiceImpl.java
...ava/com/gic/store/service/impl/StorePhotoServiceImpl.java
+59
-0
StoreServiceImpl.java
...ain/java/com/gic/store/service/impl/StoreServiceImpl.java
+90
-0
StoreApiServiceImpl.java
...java/com/gic/store/service/outer/StoreApiServiceImpl.java
+97
-0
StoreBrandApiServiceImpl.java
...com/gic/store/service/outer/StoreBrandApiServiceImpl.java
+28
-4
dubbo-gic-store-service.xml
...re-service/src/main/resources/dubbo-gic-store-service.xml
+4
-1
TabStoreBrandMapper.xml
...service/src/main/resources/mapper/TabStoreBrandMapper.xml
+14
-0
TabStoreBusinessTimeMapper.xml
.../src/main/resources/mapper/TabStoreBusinessTimeMapper.xml
+7
-0
TabStoreMapper.xml
...tore-service/src/main/resources/mapper/TabStoreMapper.xml
+73
-8
TabStorePhotoMapper.xml
...service/src/main/resources/mapper/TabStorePhotoMapper.xml
+26
-3
StoreBrandController.java
...va/com/gic/store/web/controller/StoreBrandController.java
+1
-1
StoreController.java
...in/java/com/gic/store/web/controller/StoreController.java
+65
-0
StoreQO.java
...web/src/main/java/com/gic/store/web/qo/store/StoreQO.java
+292
-0
dubbo-gic-store-web.xml
gic-store-web/src/main/resources/dubbo-gic-store-web.xml
+3
-0
No files found.
gic-store-api/src/main/java/com/gic/store/dto/StoreBusinessTimeDTO.java
View file @
1c2cdd99
package
com
.
gic
.
store
.
dto
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* @author zhiwj
...
...
@@ -8,4 +9,69 @@ import java.io.Serializable;
*/
public
class
StoreBusinessTimeDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
1536451717040174983L
;
/**
*
*/
private
Integer
storeBusinessTimeId
;
/**
* 周一,周二
*/
private
String
weekday
;
/**
*
*/
private
Date
openTime
;
/**
*
*/
private
Date
closeTime
;
/**
*
*/
private
Integer
storeId
;
public
Integer
getStoreBusinessTimeId
()
{
return
storeBusinessTimeId
;
}
public
void
setStoreBusinessTimeId
(
Integer
storeBusinessTimeId
)
{
this
.
storeBusinessTimeId
=
storeBusinessTimeId
;
}
public
String
getWeekday
()
{
return
weekday
;
}
public
void
setWeekday
(
String
weekday
)
{
this
.
weekday
=
weekday
;
}
public
Date
getOpenTime
()
{
return
openTime
;
}
public
void
setOpenTime
(
Date
openTime
)
{
this
.
openTime
=
openTime
;
}
public
Date
getCloseTime
()
{
return
closeTime
;
}
public
void
setCloseTime
(
Date
closeTime
)
{
this
.
closeTime
=
closeTime
;
}
public
Integer
getStoreId
()
{
return
storeId
;
}
public
void
setStoreId
(
Integer
storeId
)
{
this
.
storeId
=
storeId
;
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java
View file @
1c2cdd99
package
com
.
gic
.
store
.
dto
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
/**
* @author zhiwj
...
...
@@ -8,4 +10,292 @@ import java.io.Serializable;
*/
public
class
StoreDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
6360038263126373120L
;
/**
*
*/
private
Integer
storeId
;
/**
*
*/
private
Integer
enterpriseId
;
/**
* 门店名称
*/
private
String
storeName
;
/**
* 门店code
*/
private
String
storeCode
;
/**
* 域id
*/
private
Integer
regionId
;
/**
* 门店电话
*/
private
String
conactsPhone
;
/**
* 门店详细地址
*/
private
String
address
;
/**
* 关联门店品牌iid,多个用逗号分隔
*/
private
String
brandIds
;
/**
* 地区id
*/
private
String
areaId
;
/**
* 经度
*/
private
String
longitude
;
/**
* 纬度
*/
private
String
latitude
;
/**
* 溢出状态;默认为0,1标识溢出
*/
private
Integer
overflowStatus
;
/**
* 门店启用状态;1启用 2不启用
*/
private
Integer
status
;
/**
* erp门店状态
*/
private
Integer
erpStatus
;
/**
* 门店类型
*/
private
Integer
storeType
;
/**
*
*/
private
Integer
storeGroupId
;
/**
*
*/
private
Date
createTime
;
/**
*
*/
private
Date
updateTime
;
private
List
<
StoreBrandDTO
>
brandList
;
private
List
<
StorePhotoDTO
>
photoList
;
private
String
delPhotos
;
private
String
delBusinessTimes
;
private
List
<
StoreBusinessTimeDTO
>
businessTimeList
;
private
String
storeGroupName
;
public
Integer
getStoreId
()
{
return
storeId
;
}
public
void
setStoreId
(
Integer
storeId
)
{
this
.
storeId
=
storeId
;
}
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
Integer
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
String
getStoreName
()
{
return
storeName
;
}
public
void
setStoreName
(
String
storeName
)
{
this
.
storeName
=
storeName
;
}
public
String
getStoreCode
()
{
return
storeCode
;
}
public
void
setStoreCode
(
String
storeCode
)
{
this
.
storeCode
=
storeCode
;
}
public
Integer
getRegionId
()
{
return
regionId
;
}
public
void
setRegionId
(
Integer
regionId
)
{
this
.
regionId
=
regionId
;
}
public
String
getConactsPhone
()
{
return
conactsPhone
;
}
public
void
setConactsPhone
(
String
conactsPhone
)
{
this
.
conactsPhone
=
conactsPhone
;
}
public
String
getAddress
()
{
return
address
;
}
public
void
setAddress
(
String
address
)
{
this
.
address
=
address
;
}
public
String
getBrandIds
()
{
return
brandIds
;
}
public
void
setBrandIds
(
String
brandIds
)
{
this
.
brandIds
=
brandIds
;
}
public
String
getAreaId
()
{
return
areaId
;
}
public
void
setAreaId
(
String
areaId
)
{
this
.
areaId
=
areaId
;
}
public
String
getLongitude
()
{
return
longitude
;
}
public
void
setLongitude
(
String
longitude
)
{
this
.
longitude
=
longitude
;
}
public
String
getLatitude
()
{
return
latitude
;
}
public
void
setLatitude
(
String
latitude
)
{
this
.
latitude
=
latitude
;
}
public
Integer
getOverflowStatus
()
{
return
overflowStatus
;
}
public
void
setOverflowStatus
(
Integer
overflowStatus
)
{
this
.
overflowStatus
=
overflowStatus
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
Integer
getErpStatus
()
{
return
erpStatus
;
}
public
void
setErpStatus
(
Integer
erpStatus
)
{
this
.
erpStatus
=
erpStatus
;
}
public
Integer
getStoreType
()
{
return
storeType
;
}
public
void
setStoreType
(
Integer
storeType
)
{
this
.
storeType
=
storeType
;
}
public
Integer
getStoreGroupId
()
{
return
storeGroupId
;
}
public
void
setStoreGroupId
(
Integer
storeGroupId
)
{
this
.
storeGroupId
=
storeGroupId
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
List
<
StoreBrandDTO
>
getBrandList
()
{
return
brandList
;
}
public
void
setBrandList
(
List
<
StoreBrandDTO
>
brandList
)
{
this
.
brandList
=
brandList
;
}
public
List
<
StorePhotoDTO
>
getPhotoList
()
{
return
photoList
;
}
public
void
setPhotoList
(
List
<
StorePhotoDTO
>
photoList
)
{
this
.
photoList
=
photoList
;
}
public
String
getDelPhotos
()
{
return
delPhotos
;
}
public
void
setDelPhotos
(
String
delPhotos
)
{
this
.
delPhotos
=
delPhotos
;
}
public
String
getDelBusinessTimes
()
{
return
delBusinessTimes
;
}
public
void
setDelBusinessTimes
(
String
delBusinessTimes
)
{
this
.
delBusinessTimes
=
delBusinessTimes
;
}
public
List
<
StoreBusinessTimeDTO
>
getBusinessTimeList
()
{
return
businessTimeList
;
}
public
void
setBusinessTimeList
(
List
<
StoreBusinessTimeDTO
>
businessTimeList
)
{
this
.
businessTimeList
=
businessTimeList
;
}
public
void
setStoreGroupName
(
String
storeGroupName
)
{
this
.
storeGroupName
=
storeGroupName
;
}
public
String
getStoreGroupName
()
{
return
storeGroupName
;
}
}
gic-store-api/src/main/java/com/gic/store/dto/StorePhotoDTO.java
View file @
1c2cdd99
...
...
@@ -8,4 +8,81 @@ import java.io.Serializable;
*/
public
class
StorePhotoDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
5626497584010021599L
;
/**
*
*/
private
Integer
storePhotoId
;
/**
*
*/
private
Integer
storeId
;
/**
*
*/
private
Integer
enterpriseId
;
/**
*
*/
private
String
imageCode
;
/**
*
*/
private
String
imageUrl
;
/**
*
*/
private
Integer
sort
;
public
Integer
getStorePhotoId
()
{
return
storePhotoId
;
}
public
void
setStorePhotoId
(
Integer
storePhotoId
)
{
this
.
storePhotoId
=
storePhotoId
;
}
public
Integer
getStoreId
()
{
return
storeId
;
}
public
void
setStoreId
(
Integer
storeId
)
{
this
.
storeId
=
storeId
;
}
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
Integer
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
String
getImageCode
()
{
return
imageCode
;
}
public
void
setImageCode
(
String
imageCode
)
{
this
.
imageCode
=
imageCode
;
}
public
String
getImageUrl
()
{
return
imageUrl
;
}
public
void
setImageUrl
(
String
imageUrl
)
{
this
.
imageUrl
=
imageUrl
;
}
public
Integer
getSort
()
{
return
sort
;
}
public
void
setSort
(
Integer
sort
)
{
this
.
sort
=
sort
;
}
}
gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java
View file @
1c2cdd99
...
...
@@ -10,6 +10,8 @@ import com.gic.store.dto.StoreDTO;
*/
public
interface
StoreApiService
{
ServiceResponse
<
Integer
>
saveOrUpdate
(
StoreDTO
storeDTO
);
/**
* 分页门店列表 查es
* @param storeDTO
...
...
@@ -26,5 +28,4 @@ public interface StoreApiService {
*/
ServiceResponse
<
Integer
>
costStoreMove
(
String
storeIds
,
String
toStoreId
);
ServiceResponse
<
Integer
>
saveOrUpdate
(
StoreDTO
storeDTO
);
}
gic-store-api/src/main/java/com/gic/store/service/StoreBrandApiService.java
View file @
1c2cdd99
...
...
@@ -23,7 +23,7 @@ public interface StoreBrandApiService {
* @param ids
* @return 不能被删除的品牌(在使用中的品牌)
*/
ServiceResponse
<
List
<
StoreBrandDTO
>>
deleteByIds
(
Integer
enterpriseId
,
String
ids
);
ServiceResponse
<
List
<
Integer
>>
deleteByIds
(
Integer
enterpriseId
,
String
ids
);
/**
* 移动顺序
...
...
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBrandMapper.java
View file @
1c2cdd99
...
...
@@ -119,4 +119,6 @@ public interface TabStoreBrandMapper {
* @return
*/
Integer
deleteByIds
(
@Param
(
"ids"
)
List
<
Integer
>
ids
);
List
<
TabStoreBrand
>
listStoreBrandByIds
(
@Param
(
"ids"
)
List
<
Integer
>
idList
);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBusinessTimeMapper.java
View file @
1c2cdd99
...
...
@@ -2,6 +2,8 @@ package com.gic.store.dao.mapper;
import
com.gic.store.entity.TabStoreBusinessTime
;
import
java.util.List
;
public
interface
TabStoreBusinessTimeMapper
{
/**
* 根据主键删除
...
...
@@ -50,4 +52,6 @@ public interface TabStoreBusinessTimeMapper {
* @return 更新条目数
*/
int
updateByPrimaryKey
(
TabStoreBusinessTime
record
);
List
<
TabStoreBusinessTime
>
listBusinessTime
(
Integer
storeId
);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreMapper.java
View file @
1c2cdd99
package
com
.
gic
.
store
.
dao
.
mapper
;
import
com.gic.store.entity.TabStore
;
import
org.apache.ibatis.annotations.Param
;
public
interface
TabStoreMapper
{
/**
...
...
@@ -50,4 +51,10 @@ public interface TabStoreMapper {
* @return 更新条目数
*/
int
updateByPrimaryKey
(
TabStore
record
);
Integer
countBySelective
(
TabStore
tabStore
);
Integer
updateGroupId
(
@Param
(
"oldStoreGroupId"
)
Integer
oldStoreGroupIds
,
@Param
(
"newStoreGroupId"
)
Integer
newStoreGroupId
);
Integer
countByBrandId
(
@Param
(
"brandId"
)
Integer
brandId
);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStorePhotoMapper.java
View file @
1c2cdd99
package
com
.
gic
.
store
.
dao
.
mapper
;
import
com.gic.store.entity.TabStorePhoto
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
public
interface
TabStorePhotoMapper
{
/**
...
...
@@ -50,4 +53,6 @@ public interface TabStorePhotoMapper {
* @return 更新条目数
*/
int
updateByPrimaryKey
(
TabStorePhoto
record
);
List
<
TabStorePhoto
>
listStorePhoto
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
,
@Param
(
"storeId"
)
Integer
storeId
);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/entity/TabStore.java
View file @
1c2cdd99
...
...
@@ -47,11 +47,26 @@ public class TabStore {
private
String
brandIds
;
/**
* 省份id
*/
private
String
provinceId
;
/**
* 城市id
*/
private
String
cityId
;
/**
* 地区id
*/
private
String
areaId
;
/**
* 省市区全名
*/
private
String
provinces
;
/**
* 经度
*/
private
String
longitude
;
...
...
@@ -87,6 +102,11 @@ public class TabStore {
private
Integer
storeGroupId
;
/**
* 门店创建方式,1:后台新增 2:批量导入 3:订单生成 4:erp同步
*/
private
Integer
createType
;
/**
*
*/
private
Date
createTime
;
...
...
@@ -160,6 +180,22 @@ public class TabStore {
this
.
brandIds
=
brandIds
;
}
public
String
getProvinceId
()
{
return
provinceId
;
}
public
void
setProvinceId
(
String
provinceId
)
{
this
.
provinceId
=
provinceId
;
}
public
String
getCityId
()
{
return
cityId
;
}
public
void
setCityId
(
String
cityId
)
{
this
.
cityId
=
cityId
;
}
public
String
getAreaId
()
{
return
areaId
;
}
...
...
@@ -168,6 +204,14 @@ public class TabStore {
this
.
areaId
=
areaId
;
}
public
String
getProvinces
()
{
return
provinces
;
}
public
void
setProvinces
(
String
provinces
)
{
this
.
provinces
=
provinces
;
}
public
String
getLongitude
()
{
return
longitude
;
}
...
...
@@ -224,6 +268,14 @@ public class TabStore {
this
.
storeGroupId
=
storeGroupId
;
}
public
Integer
getCreateType
()
{
return
createType
;
}
public
void
setCreateType
(
Integer
createType
)
{
this
.
createType
=
createType
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
...
...
gic-store-service/src/main/java/com/gic/store/entity/TabStorePhoto.java
View file @
1c2cdd99
...
...
@@ -39,6 +39,11 @@ public class TabStorePhoto {
/**
*
*/
private
Integer
status
;
/**
*
*/
private
Date
createTime
;
/**
...
...
@@ -94,6 +99,14 @@ public class TabStorePhoto {
this
.
sort
=
sort
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
...
...
gic-store-service/src/main/java/com/gic/store/service/StoreBrandService.java
View file @
1c2cdd99
...
...
@@ -33,5 +33,7 @@ public interface StoreBrandService {
void
setStoreBrandSort
(
Integer
enterpriseId
,
Integer
storeBrandId
,
Integer
seq
);
Integer
deleteByIds
(
Integer
enterpriseId
,
String
ids
);
Integer
deleteByIds
(
Integer
enterpriseId
,
List
<
Integer
>
delList
);
List
<
TabStoreBrand
>
listStoreBrandByIds
(
String
brandIds
);
}
gic-store-service/src/main/java/com/gic/store/service/StoreBusinessTimeService.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
service
;
import
com.gic.store.dto.StoreBusinessTimeDTO
;
import
com.gic.store.entity.TabStoreBusinessTime
;
import
java.util.List
;
/**
* @author zhiwj
* @date 2019/6/28
*/
public
interface
StoreBusinessTimeService
{
void
editStoreBusinessTime
(
Integer
enterpriseId
,
Integer
storeId
,
List
<
StoreBusinessTimeDTO
>
businessTimeList
,
List
<
Integer
>
delBusinessTimes
);
List
<
TabStoreBusinessTime
>
listBusinessTime
(
Integer
storeId
);
}
gic-store-service/src/main/java/com/gic/store/service/StorePhotoService.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
service
;
import
com.gic.store.dto.StorePhotoDTO
;
import
com.gic.store.entity.TabStorePhoto
;
import
java.util.List
;
/**
* @author zhiwj
* @date 2019/6/27
*/
public
interface
StorePhotoService
{
void
editStoreImage
(
Integer
enterpriseId
,
Integer
storeId
,
List
<
StorePhotoDTO
>
photoList
,
List
<
Integer
>
delPhotos
);
List
<
TabStorePhoto
>
listStorePhoto
(
Integer
enterpriseId
,
Integer
storeId
);
}
gic-store-service/src/main/java/com/gic/store/service/StoreService.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
service
;
import
com.gic.store.dto.StoreDTO
;
import
com.gic.store.entity.TabStore
;
/**
* @author zhiwj
* @date 2019/6/27
*/
public
interface
StoreService
{
/**
* 保存
* @param storeDTO
* @return 返回id
*/
Integer
save
(
StoreDTO
storeDTO
);
Integer
update
(
StoreDTO
storeDTO
);
/**
* 该分组下门店的个数
* @param storeGroupId
* @return
*/
Integer
countByGroupId
(
Integer
storeGroupId
);
/**
* 修改门店分组
* @param oldStoreGroupId
* @param newStoreGroupId
* @return
*/
Integer
updateGroupId
(
Integer
oldStoreGroupId
,
Integer
newStoreGroupId
);
TabStore
getById
(
Integer
storeId
);
/**
* 查询使用了该品牌的门店个数
* @param brandId
* @return
*/
Integer
countByBrandId
(
Integer
brandId
);
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreBrandServiceImpl.java
View file @
1c2cdd99
...
...
@@ -150,12 +150,20 @@ public class StoreBrandServiceImpl implements StoreBrandService {
}
@Override
public
Integer
deleteByIds
(
Integer
enterpriseId
,
String
ids
)
{
List
<
String
>
idStrList
=
Arrays
.
asList
(
ids
.
split
(
","
));
public
Integer
deleteByIds
(
Integer
enterpriseId
,
List
<
Integer
>
delList
)
{
if
(
CollectionUtils
.
isNotEmpty
(
delList
))
{
return
tabStoreBrandMapper
.
deleteByIds
(
delList
);
}
return
0
;
}
@Override
public
List
<
TabStoreBrand
>
listStoreBrandByIds
(
String
brandIds
)
{
List
<
String
>
idStrList
=
Arrays
.
asList
(
brandIds
.
split
(
","
));
if
(
CollectionUtils
.
isNotEmpty
(
idStrList
))
{
List
<
Integer
>
idList
=
idStrList
.
stream
().
map
(
Integer:
:
parseInt
).
collect
(
Collectors
.
toList
());
return
tabStoreBrandMapper
.
delete
ByIds
(
idList
);
return
tabStoreBrandMapper
.
listStoreBrand
ByIds
(
idList
);
}
return
0
;
return
null
;
}
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreBusinessTimeServiceImpl.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
service
.
impl
;
import
com.gic.store.dao.mapper.TabStoreBusinessTimeMapper
;
import
com.gic.store.dto.StoreBusinessTimeDTO
;
import
com.gic.store.entity.TabStoreBusinessTime
;
import
com.gic.store.service.StoreBusinessTimeService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
/**
* @author zhiwj
* @date 2019/6/28
*/
@Service
public
class
StoreBusinessTimeServiceImpl
implements
StoreBusinessTimeService
{
@Autowired
TabStoreBusinessTimeMapper
tabStoreBusinessTimeMapper
;
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
editStoreBusinessTime
(
Integer
enterpriseId
,
Integer
storeId
,
List
<
StoreBusinessTimeDTO
>
businessTimeList
,
List
<
Integer
>
delBusinessTimes
)
{
if
(
CollectionUtils
.
isNotEmpty
(
delBusinessTimes
))
{
for
(
Integer
delId
:
delBusinessTimes
)
{
tabStoreBusinessTimeMapper
.
deleteByPrimaryKey
(
delId
);
}
}
for
(
StoreBusinessTimeDTO
storeBusinessTimeDTO
:
businessTimeList
)
{
TabStoreBusinessTime
businessTime
=
new
TabStoreBusinessTime
();
businessTime
.
setStoreBusinessTimeId
(
storeBusinessTimeDTO
.
getStoreBusinessTimeId
());
businessTime
.
setWeekday
(
storeBusinessTimeDTO
.
getWeekday
());
businessTime
.
setOpenTime
(
storeBusinessTimeDTO
.
getOpenTime
());
businessTime
.
setCloseTime
(
storeBusinessTimeDTO
.
getCloseTime
());
businessTime
.
setStoreId
(
storeId
);
tabStoreBusinessTimeMapper
.
insertSelective
(
businessTime
);
}
}
@Override
public
List
<
TabStoreBusinessTime
>
listBusinessTime
(
Integer
storeId
)
{
return
tabStoreBusinessTimeMapper
.
listBusinessTime
(
storeId
);
}
}
gic-store-service/src/main/java/com/gic/store/service/impl/StorePhotoServiceImpl.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
service
.
impl
;
import
com.gic.commons.util.GlobalInfo
;
import
com.gic.store.dao.mapper.TabStorePhotoMapper
;
import
com.gic.store.dto.StorePhotoDTO
;
import
com.gic.store.entity.TabStorePhoto
;
import
com.gic.store.service.StorePhotoService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.Date
;
import
java.util.List
;
/**
* @author zhiwj
* @date 2019/6/27
*/
@Service
public
class
StorePhotoServiceImpl
implements
StorePhotoService
{
@Autowired
private
TabStorePhotoMapper
tabStorePhotoMapper
;
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
editStoreImage
(
Integer
enterpriseId
,
Integer
storeId
,
List
<
StorePhotoDTO
>
photoList
,
List
<
Integer
>
delPhotos
)
{
if
(
CollectionUtils
.
isNotEmpty
(
delPhotos
))
{
for
(
Integer
delId
:
delPhotos
)
{
TabStorePhoto
storePhoto
=
new
TabStorePhoto
();
storePhoto
.
setStorePhotoId
(
delId
);
storePhoto
.
setStatus
(
GlobalInfo
.
DATA_STATUS_DELETE
);
tabStorePhotoMapper
.
updateByPrimaryKeySelective
(
storePhoto
);
}
}
for
(
StorePhotoDTO
storePhotoDTO
:
photoList
)
{
TabStorePhoto
storePhoto
=
new
TabStorePhoto
();
storePhoto
.
setStorePhotoId
(
storePhotoDTO
.
getStorePhotoId
());
storePhoto
.
setStoreId
(
storeId
);
storePhoto
.
setEnterpriseId
(
enterpriseId
);
storePhoto
.
setImageCode
(
storePhotoDTO
.
getImageCode
());
storePhoto
.
setImageUrl
(
storePhotoDTO
.
getImageUrl
());
storePhoto
.
setSort
(
storePhotoDTO
.
getSort
());
if
(
storePhoto
.
getStorePhotoId
()
==
null
)
{
storePhoto
.
setCreateTime
(
new
Date
());
tabStorePhotoMapper
.
insertSelective
(
storePhoto
);
}
else
{
tabStorePhotoMapper
.
updateByPrimaryKeySelective
(
storePhoto
);
}
}
}
@Override
public
List
<
TabStorePhoto
>
listStorePhoto
(
Integer
enterpriseId
,
Integer
storeId
)
{
return
tabStorePhotoMapper
.
listStorePhoto
(
enterpriseId
,
storeId
);
}
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
service
.
impl
;
import
com.gic.store.dao.mapper.TabStoreMapper
;
import
com.gic.store.dto.StoreDTO
;
import
com.gic.store.entity.TabStore
;
import
com.gic.store.service.StoreService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.Date
;
/**
* @author zhiwj
* @date 2019/6/27
*/
@Service
public
class
StoreServiceImpl
implements
StoreService
{
@Autowired
TabStoreMapper
tabStoreMapper
;
@Override
public
Integer
save
(
StoreDTO
storeDTO
)
{
TabStore
tabStore
=
new
TabStore
();
tabStore
.
setEnterpriseId
(
storeDTO
.
getEnterpriseId
());
tabStore
.
setStoreName
(
storeDTO
.
getStoreName
());
tabStore
.
setStoreCode
(
storeDTO
.
getStoreCode
());
tabStore
.
setRegionId
(
storeDTO
.
getRegionId
());
tabStore
.
setConactsPhone
(
storeDTO
.
getConactsPhone
());
tabStore
.
setAddress
(
storeDTO
.
getAddress
());
tabStore
.
setBrandIds
(
storeDTO
.
getBrandIds
());
tabStore
.
setAreaId
(
storeDTO
.
getAreaId
());
tabStore
.
setLongitude
(
storeDTO
.
getLongitude
());
tabStore
.
setLatitude
(
storeDTO
.
getLatitude
());
// TODO 这里要判断一下总量
tabStore
.
setOverflowStatus
(
0
);
tabStore
.
setStatus
(
storeDTO
.
getStatus
());
tabStore
.
setErpStatus
(
storeDTO
.
getErpStatus
());
tabStore
.
setStoreType
(
storeDTO
.
getStoreType
());
tabStore
.
setStoreGroupId
(
storeDTO
.
getStoreGroupId
());
tabStore
.
setCreateTime
(
new
Date
());
return
tabStoreMapper
.
insertSelective
(
tabStore
);
}
@Override
public
Integer
update
(
StoreDTO
copy
)
{
TabStore
tabStore
=
new
TabStore
();
tabStore
.
setStoreId
(
copy
.
getStoreId
());
tabStore
.
setEnterpriseId
(
copy
.
getEnterpriseId
());
tabStore
.
setStoreName
(
copy
.
getStoreName
());
tabStore
.
setRegionId
(
copy
.
getRegionId
());
tabStore
.
setConactsPhone
(
copy
.
getConactsPhone
());
tabStore
.
setAddress
(
copy
.
getAddress
());
tabStore
.
setBrandIds
(
copy
.
getBrandIds
());
tabStore
.
setAreaId
(
copy
.
getAreaId
());
tabStore
.
setLongitude
(
copy
.
getLongitude
());
tabStore
.
setLatitude
(
copy
.
getLatitude
());
tabStore
.
setStatus
(
copy
.
getStatus
());
tabStore
.
setErpStatus
(
copy
.
getErpStatus
());
tabStore
.
setStoreType
(
copy
.
getStoreType
());
tabStore
.
setStoreGroupId
(
copy
.
getStoreGroupId
());
// TODO 这里要判断一下总量
tabStore
.
setOverflowStatus
(
0
);
return
tabStoreMapper
.
updateByPrimaryKeySelective
(
tabStore
);
}
@Override
public
Integer
countByGroupId
(
Integer
storeGroupId
)
{
TabStore
tabStore
=
new
TabStore
();
tabStore
.
setStoreGroupId
(
storeGroupId
);
return
tabStoreMapper
.
countBySelective
(
tabStore
);
}
@Override
public
Integer
updateGroupId
(
Integer
oldStoreGroupId
,
Integer
newStoreGroupId
)
{
return
tabStoreMapper
.
updateGroupId
(
oldStoreGroupId
,
newStoreGroupId
);
}
@Override
public
TabStore
getById
(
Integer
storeId
)
{
return
tabStoreMapper
.
selectByPrimaryKey
(
storeId
);
}
@Override
public
Integer
countByBrandId
(
Integer
brandId
)
{
return
tabStoreMapper
.
countByBrandId
(
brandId
);
}
}
gic-store-service/src/main/java/com/gic/store/service/outer/StoreApiServiceImpl.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
service
.
outer
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.store.dao.mapper.TabStoreGroupMapper
;
import
com.gic.store.dto.StoreBrandDTO
;
import
com.gic.store.dto.StoreBusinessTimeDTO
;
import
com.gic.store.dto.StoreDTO
;
import
com.gic.store.dto.StorePhotoDTO
;
import
com.gic.store.entity.*
;
import
com.gic.store.service.*
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
* @author zhiwj
* @date 2019/6/27
*/
@Service
(
"storeApiService"
)
public
class
StoreApiServiceImpl
implements
StoreApiService
{
@Autowired
private
StoreService
storeService
;
@Autowired
private
StoreBrandService
storeBrandService
;
@Autowired
private
StorePhotoService
storePhotoService
;
@Autowired
private
StoreBusinessTimeService
storeBusinessTimeService
;
@Autowired
private
TabStoreGroupMapper
tabStoreGroupMapper
;
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ServiceResponse
<
Integer
>
saveOrUpdate
(
StoreDTO
storeDTO
)
{
// 门店自身信息
if
(
storeDTO
.
getStoreId
()
==
null
)
{
Integer
id
=
storeService
.
save
(
storeDTO
);
storeDTO
.
setStoreId
(
id
);
}
else
{
storeService
.
update
(
storeDTO
);
}
// 门店图片
List
<
Integer
>
delPhotos
=
null
;
if
(
StringUtils
.
isNotEmpty
(
storeDTO
.
getDelPhotos
()))
{
List
<
String
>
photoIds
=
Arrays
.
asList
(
storeDTO
.
getDelPhotos
().
split
(
","
));
delPhotos
=
photoIds
.
stream
().
map
(
Integer:
:
parseInt
).
collect
(
Collectors
.
toList
());
}
storePhotoService
.
editStoreImage
(
storeDTO
.
getEnterpriseId
(),
storeDTO
.
getStoreId
(),
storeDTO
.
getPhotoList
(),
delPhotos
);
// 营业时间
List
<
Integer
>
delBusinessTimes
=
null
;
if
(
StringUtils
.
isNotEmpty
(
storeDTO
.
getDelBusinessTimes
()))
{
List
<
String
>
delBusinessTimeIds
=
Arrays
.
asList
(
storeDTO
.
getDelBusinessTimes
().
split
(
","
));
delBusinessTimes
=
delBusinessTimeIds
.
stream
().
map
(
Integer:
:
parseInt
).
collect
(
Collectors
.
toList
());
}
storeBusinessTimeService
.
editStoreBusinessTime
(
storeDTO
.
getEnterpriseId
(),
storeDTO
.
getStoreId
(),
storeDTO
.
getBusinessTimeList
(),
delBusinessTimes
);
return
ServiceResponse
.
success
();
}
@Override
public
ServiceResponse
<
Page
<
StoreDTO
>>
listStore
(
StoreDTO
storeDTO
,
Integer
pageNum
,
Integer
pageSize
)
{
return
null
;
}
@Override
public
ServiceResponse
<
StoreDTO
>
getStoreById
(
Integer
enterpriseId
,
Integer
storeId
)
{
TabStore
store
=
storeService
.
getById
(
storeId
);
StoreDTO
storeDTO
=
EntityUtil
.
changeEntityByOrika
(
StoreDTO
.
class
,
store
);
TabStoreGroup
storeGroup
=
tabStoreGroupMapper
.
selectByPrimaryKey
(
storeId
);
if
(
storeGroup
!=
null
)
{
storeDTO
.
setStoreGroupName
(
storeGroup
.
getStoreGroupName
());
}
List
<
TabStorePhoto
>
tabPhotoList
=
storePhotoService
.
listStorePhoto
(
storeDTO
.
getEnterpriseId
(),
storeDTO
.
getStoreId
());
List
<
StorePhotoDTO
>
photoDTOList
=
EntityUtil
.
changeEntityListByOrika
(
StorePhotoDTO
.
class
,
tabPhotoList
);
storeDTO
.
setPhotoList
(
photoDTOList
);
List
<
TabStoreBusinessTime
>
tabBusinessTimeList
=
storeBusinessTimeService
.
listBusinessTime
(
store
.
getStoreId
());
List
<
StoreBusinessTimeDTO
>
businessTimeDTOList
=
EntityUtil
.
changeEntityListByOrika
(
StoreBusinessTimeDTO
.
class
,
tabBusinessTimeList
);
storeDTO
.
setBusinessTimeList
(
businessTimeDTOList
);
List
<
TabStoreBrand
>
storeBrandList
=
storeBrandService
.
listStoreBrandByIds
(
store
.
getBrandIds
());
List
<
StoreBrandDTO
>
brandDTOList
=
EntityUtil
.
changeEntityListByOrika
(
StoreBrandDTO
.
class
,
storeBrandList
);
storeDTO
.
setBrandList
(
brandDTOList
);
return
ServiceResponse
.
success
(
storeDTO
);
}
@Override
public
ServiceResponse
<
Integer
>
costStoreMove
(
String
storeIds
,
String
toStoreId
)
{
return
null
;
}
}
gic-store-service/src/main/java/com/gic/store/service/outer/StoreBrandApiServiceImpl.java
View file @
1c2cdd99
...
...
@@ -3,19 +3,26 @@ package com.gic.store.service.outer;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.GlobalInfo
;
import
com.gic.commons.util.PageHelperUtils
;
import
com.gic.store.dto.StoreBrandDTO
;
import
com.gic.store.entity.TabStoreBrand
;
import
com.gic.store.service.StoreBrandApiService
;
import
com.gic.store.service.StoreBrandService
;
import
com.gic.store.service.StoreService
;
import
com.gic.store.utils.ErrorCode
;
import
com.gic.store.utils.MoveType
;
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.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
* @author zhiwj
...
...
@@ -30,6 +37,8 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
@Autowired
private
StoreBrandService
storeBrandService
;
@Autowired
private
StoreService
storeService
;
@Override
public
ServiceResponse
<
Integer
>
saveOrUpdateStoreBrand
(
StoreBrandDTO
storeBrandDTO
)
{
...
...
@@ -77,11 +86,26 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
}
@Override
public
ServiceResponse
<
List
<
StoreBrandDTO
>>
deleteByIds
(
Integer
enterpriseId
,
String
ids
)
{
public
ServiceResponse
<
List
<
Integer
>>
deleteByIds
(
Integer
enterpriseId
,
String
ids
)
{
//TODO 要查询门店中是否使用门店品牌
storeBrandService
.
deleteByIds
(
enterpriseId
,
ids
);
return
ServiceResponse
.
success
();
List
<
Integer
>
notDelList
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
ids
))
{
String
[]
idArr
=
ids
.
split
(
GlobalInfo
.
FLAG_COMMA
);
List
<
Integer
>
delList
=
Stream
.
of
(
idArr
)
.
map
(
Integer:
:
parseInt
)
.
filter
(
id
->
{
Integer
count
=
storeService
.
countByBrandId
(
id
);
if
(
count
>
0
)
{
notDelList
.
add
(
count
);
}
return
count
==
0
;
})
.
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
delList
))
{
storeBrandService
.
deleteByIds
(
enterpriseId
,
delList
);
}
}
return
ServiceResponse
.
success
(
notDelList
);
}
@Override
...
...
gic-store-service/src/main/resources/dubbo-gic-store-service.xml
View file @
1c2cdd99
...
...
@@ -14,8 +14,9 @@
<dubbo:application
name=
"gic-store-service"
/>
<dubbo:protocol
name=
"dubbo"
port=
"30102"
/>
<!--门店域-->
<dubbo:service
interface=
"com.gic.store.service.StoreRegionApiService"
ref=
"storeRegionApiService"
timeout=
"60000"
/>
<!--门店品牌-->
<dubbo:service
interface=
"com.gic.store.service.StoreBrandApiService"
ref=
"storeBrandApiService"
timeout=
"60000"
/>
<dubbo:service
interface=
"com.gic.store.service.StoreDictApiService"
ref=
"storeDictApiService"
timeout=
"6000"
/>
...
...
@@ -25,5 +26,7 @@
<dubbo:service
interface=
"com.gic.store.service.StoreGroupApiService"
ref=
"storeGroupApiService"
timeout=
"60000"
/>
<!--自定义域字段-->
<dubbo:service
interface=
"com.gic.store.service.StoreFieldApiService"
ref=
"storeFieldApiService"
timeout=
"60000"
/>
<!--门店-->
<dubbo:service
interface=
"com.gic.store.service.StoreApiService"
ref=
"storeApiService"
timeout=
"60000"
/>
</beans>
gic-store-service/src/main/resources/mapper/TabStoreBrandMapper.xml
View file @
1c2cdd99
...
...
@@ -248,5 +248,18 @@
</if>
</where>
</update>
<select
id=
"listStoreBrandByIds"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_store_brand
where status = 1
<if
test=
"null != ids and ids.size() > 0"
>
and store_brand_id in
<foreach
collection=
"ids"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
order by sort
</select>
</mapper>
\ No newline at end of file
gic-store-service/src/main/resources/mapper/TabStoreBusinessTimeMapper.xml
View file @
1c2cdd99
...
...
@@ -114,4 +114,10 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}
where store_business_time_id = #{storeBusinessTimeId,jdbcType=INTEGER}
</update>
<select
id=
"listBusinessTime"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_store_business_time
where store_id = #{storeId}
</select>
</mapper>
\ No newline at end of file
gic-store-service/src/main/resources/mapper/TabStoreMapper.xml
View file @
1c2cdd99
...
...
@@ -10,7 +10,10 @@
<result
column=
"conacts_phone"
jdbcType=
"VARCHAR"
property=
"conactsPhone"
/>
<result
column=
"address"
jdbcType=
"VARCHAR"
property=
"address"
/>
<result
column=
"brand_ids"
jdbcType=
"VARCHAR"
property=
"brandIds"
/>
<result
column=
"province_id"
jdbcType=
"VARCHAR"
property=
"provinceId"
/>
<result
column=
"city_id"
jdbcType=
"VARCHAR"
property=
"cityId"
/>
<result
column=
"area_id"
jdbcType=
"VARCHAR"
property=
"areaId"
/>
<result
column=
"provinces"
jdbcType=
"VARCHAR"
property=
"provinces"
/>
<result
column=
"longitude"
jdbcType=
"VARCHAR"
property=
"longitude"
/>
<result
column=
"latitude"
jdbcType=
"VARCHAR"
property=
"latitude"
/>
<result
column=
"overflow_status"
jdbcType=
"INTEGER"
property=
"overflowStatus"
/>
...
...
@@ -18,13 +21,14 @@
<result
column=
"erp_status"
jdbcType=
"INTEGER"
property=
"erpStatus"
/>
<result
column=
"store_type"
jdbcType=
"INTEGER"
property=
"storeType"
/>
<result
column=
"store_group_id"
jdbcType=
"INTEGER"
property=
"storeGroupId"
/>
<result
column=
"create_type"
jdbcType=
"INTEGER"
property=
"createType"
/>
<result
column=
"create_time"
jdbcType=
"TIMESTAMP"
property=
"createTime"
/>
<result
column=
"update_time"
jdbcType=
"TIMESTAMP"
property=
"updateTime"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
store_id, enterprise_id, store_name, store_code, region_id, conacts_phone, address,
brand_ids,
area_id, longitude, latitude, overflow_status, status, erp_status, store_type
,
st
ore_group_id
, create_time, update_time
brand_ids,
province_id, city_id, area_id, provinces, longitude, latitude, overflow_status
,
st
atus, erp_status, store_type, store_group_id, create_type
, create_time, update_time
</sql>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"BaseResultMap"
>
select
...
...
@@ -39,18 +43,20 @@
<insert
id=
"insert"
parameterType=
"com.gic.store.entity.TabStore"
>
insert into tab_store (store_id, enterprise_id, store_name,
store_code, region_id, conacts_phone,
address, brand_ids, area_id,
address, brand_ids, province_id,
city_id, area_id, provinces,
longitude, latitude, overflow_status,
status, erp_status, store_type,
store_group_id, create_t
ime, update_time
)
store_group_id, create_t
ype, create_time,
update_time
)
values (#{storeId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeName,jdbcType=VARCHAR},
#{storeCode,jdbcType=VARCHAR}, #{regionId,jdbcType=INTEGER}, #{conactsPhone,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR}, #{brandIds,jdbcType=VARCHAR}, #{areaId,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR}, #{brandIds,jdbcType=VARCHAR}, #{provinceId,jdbcType=VARCHAR},
#{cityId,jdbcType=VARCHAR}, #{areaId,jdbcType=VARCHAR}, #{provinces,jdbcType=VARCHAR},
#{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{overflowStatus,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{erpStatus,jdbcType=INTEGER}, #{storeType,jdbcType=INTEGER},
#{storeGroupId,jdbcType=INTEGER}, #{createT
ime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
#{storeGroupId,jdbcType=INTEGER}, #{createT
ype,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.gic.store.entity.TabStore"
>
insert into tab_store
...
...
@@ -79,9 +85,18 @@
<if
test=
"brandIds != null"
>
brand_ids,
</if>
<if
test=
"provinceId != null"
>
province_id,
</if>
<if
test=
"cityId != null"
>
city_id,
</if>
<if
test=
"areaId != null"
>
area_id,
</if>
<if
test=
"provinces != null"
>
provinces,
</if>
<if
test=
"longitude != null"
>
longitude,
</if>
...
...
@@ -103,6 +118,9 @@
<if
test=
"storeGroupId != null"
>
store_group_id,
</if>
<if
test=
"createType != null"
>
create_type,
</if>
<if
test=
"createTime != null"
>
create_time,
</if>
...
...
@@ -135,9 +153,18 @@
<if
test=
"brandIds != null"
>
#{brandIds,jdbcType=VARCHAR},
</if>
<if
test=
"provinceId != null"
>
#{provinceId,jdbcType=VARCHAR},
</if>
<if
test=
"cityId != null"
>
#{cityId,jdbcType=VARCHAR},
</if>
<if
test=
"areaId != null"
>
#{areaId,jdbcType=VARCHAR},
</if>
<if
test=
"provinces != null"
>
#{provinces,jdbcType=VARCHAR},
</if>
<if
test=
"longitude != null"
>
#{longitude,jdbcType=VARCHAR},
</if>
...
...
@@ -159,6 +186,9 @@
<if
test=
"storeGroupId != null"
>
#{storeGroupId,jdbcType=INTEGER},
</if>
<if
test=
"createType != null"
>
#{createType,jdbcType=INTEGER},
</if>
<if
test=
"createTime != null"
>
#{createTime,jdbcType=TIMESTAMP},
</if>
...
...
@@ -191,9 +221,18 @@
<if
test=
"brandIds != null"
>
brand_ids = #{brandIds,jdbcType=VARCHAR},
</if>
<if
test=
"provinceId != null"
>
province_id = #{provinceId,jdbcType=VARCHAR},
</if>
<if
test=
"cityId != null"
>
city_id = #{cityId,jdbcType=VARCHAR},
</if>
<if
test=
"areaId != null"
>
area_id = #{areaId,jdbcType=VARCHAR},
</if>
<if
test=
"provinces != null"
>
provinces = #{provinces,jdbcType=VARCHAR},
</if>
<if
test=
"longitude != null"
>
longitude = #{longitude,jdbcType=VARCHAR},
</if>
...
...
@@ -215,6 +254,9 @@
<if
test=
"storeGroupId != null"
>
store_group_id = #{storeGroupId,jdbcType=INTEGER},
</if>
<if
test=
"createType != null"
>
create_type = #{createType,jdbcType=INTEGER},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
...
...
@@ -233,7 +275,10 @@
conacts_phone = #{conactsPhone,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR},
brand_ids = #{brandIds,jdbcType=VARCHAR},
province_id = #{provinceId,jdbcType=VARCHAR},
city_id = #{cityId,jdbcType=VARCHAR},
area_id = #{areaId,jdbcType=VARCHAR},
provinces = #{provinces,jdbcType=VARCHAR},
longitude = #{longitude,jdbcType=VARCHAR},
latitude = #{latitude,jdbcType=VARCHAR},
overflow_status = #{overflowStatus,jdbcType=INTEGER},
...
...
@@ -241,8 +286,27 @@
erp_status = #{erpStatus,jdbcType=INTEGER},
store_type = #{storeType,jdbcType=INTEGER},
store_group_id = #{storeGroupId,jdbcType=INTEGER},
create_type = #{createType,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where store_id = #{storeId,jdbcType=INTEGER}
</update>
<select
id=
"countBySelective"
parameterType=
"com.gic.store.entity.TabStore"
resultType=
"java.lang.Integer"
>
select count(1)
from tab_store
<where>
<if
test=
"storeGroupId != null"
>
and store_group_id = #{storeGroupId}
</if>
</where>
</select>
<update
id=
"updateGroupId"
>
update tab_store set store_group_id = #{newStoreGroupId} where store_group_id = #{oldStoreGroupId}
</update>
<select
id=
"countByBrandId"
resultType=
"java.lang.Integer"
>
select count(1)
from tab_store
where
brand_ids REGEXP '^${brandId}$|^${brandId},.*$|^.*,${brandId},.*$|^.*,${brandId}$'
</select>
</mapper>
\ No newline at end of file
gic-store-service/src/main/resources/mapper/TabStorePhotoMapper.xml
View file @
1c2cdd99
...
...
@@ -8,11 +8,12 @@
<result
column=
"image_code"
jdbcType=
"VARCHAR"
property=
"imageCode"
/>
<result
column=
"image_url"
jdbcType=
"VARCHAR"
property=
"imageUrl"
/>
<result
column=
"sort"
jdbcType=
"INTEGER"
property=
"sort"
/>
<result
column=
"status"
jdbcType=
"INTEGER"
property=
"status"
/>
<result
column=
"create_time"
jdbcType=
"TIMESTAMP"
property=
"createTime"
/>
<result
column=
"update_time"
jdbcType=
"TIMESTAMP"
property=
"updateTime"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
store_photo_id, store_id, enterprise_id, image_code, image_url, sort, create_time,
store_photo_id, store_id, enterprise_id, image_code, image_url, sort,
status,
create_time,
update_time
</sql>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"BaseResultMap"
>
...
...
@@ -28,10 +29,12 @@
<insert
id=
"insert"
parameterType=
"com.gic.store.entity.TabStorePhoto"
>
insert into tab_store_photo (store_photo_id, store_id, enterprise_id,
image_code, image_url, sort,
create_time, update_time)
status, create_time, update_time
)
values (#{storePhotoId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{imageCode,jdbcType=VARCHAR}, #{imageUrl,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.gic.store.entity.TabStorePhoto"
>
insert into tab_store_photo
...
...
@@ -54,6 +57,9 @@
<if
test=
"sort != null"
>
sort,
</if>
<if
test=
"status != null"
>
status,
</if>
<if
test=
"createTime != null"
>
create_time,
</if>
...
...
@@ -80,6 +86,9 @@
<if
test=
"sort != null"
>
#{sort,jdbcType=INTEGER},
</if>
<if
test=
"status != null"
>
#{status,jdbcType=INTEGER},
</if>
<if
test=
"createTime != null"
>
#{createTime,jdbcType=TIMESTAMP},
</if>
...
...
@@ -106,6 +115,9 @@
<if
test=
"sort != null"
>
sort = #{sort,jdbcType=INTEGER},
</if>
<if
test=
"status != null"
>
status = #{status,jdbcType=INTEGER},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
...
...
@@ -122,8 +134,18 @@
image_code = #{imageCode,jdbcType=VARCHAR},
image_url = #{imageUrl,jdbcType=VARCHAR},
sort = #{sort,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where store_photo_id = #{storePhotoId,jdbcType=INTEGER}
</update>
<select
id=
"listStorePhoto"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_store_photo
where status = 1
and enterprise_id = #{enterpriseId}
and store_id = #{storeId}
</select>
</mapper>
\ No newline at end of file
gic-store-web/src/main/java/com/gic/store/web/controller/StoreBrandController.java
View file @
1c2cdd99
...
...
@@ -72,7 +72,7 @@ public class StoreBrandController {
@RequestMapping
(
"/delete-store-brand-batch"
)
public
RestResponse
deleteByIds
(
String
ids
)
{
Integer
enterpriseId
=
1111
;
ServiceResponse
<
List
<
StoreBrandDTO
>>
serviceResponse
=
storeBrandApiService
.
deleteByIds
(
enterpriseId
,
ids
);
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeBrandApiService
.
deleteByIds
(
enterpriseId
,
ids
);
if
(
serviceResponse
.
isSuccess
())
{
return
RestResponse
.
success
(
serviceResponse
.
getResult
());
}
else
{
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
web
.
controller
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.store.dto.StoreBusinessTimeDTO
;
import
com.gic.store.dto.StoreDTO
;
import
com.gic.store.dto.StorePhotoDTO
;
import
com.gic.store.service.StoreApiService
;
import
com.gic.store.web.qo.store.StoreQO
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @author zhiwj
* @date 2019/6/28
*/
@RestController
public
class
StoreController
{
@Autowired
private
StoreApiService
storeApiService
;
// @RequestMapping("/save-store")
// public RestResponse saveOrUpdate(StoreQO storeQO) {
// Integer enterpriseId = 1111;
// StoreDTO storeDTO = EntityUtil.changeEntityByOrika(StoreDTO.class, storeQO);
// storeDTO.setEnterpriseId(enterpriseId);
// String photos = storeQO.getPhotos();
// if (StringUtils.isNotBlank(photos)) {
// List<StorePhotoDTO> photoList = JSON.parseArray(photos, StorePhotoDTO.class);
// storeDTO.setPhotoList(photoList);
// }
// String businessTimes = storeQO.getBusinessTimes();
// if (StringUtils.isNotBlank(businessTimes)) {
// List<StoreBusinessTimeDTO> businessTimeList = JSON.parseArray(businessTimes, StoreBusinessTimeDTO.class);
// storeDTO.setBusinessTimeList(businessTimeList);
// }
// ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
// if (serviceResponse.isSuccess()) {
// return RestResponse.success(serviceResponse.getResult());
// } else {
// return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
// }
// }
@RequestMapping
(
"/store-detail"
)
public
RestResponse
getStoreDetail
(
Integer
storeId
)
{
Integer
enterpriseId
=
1111
;
ServiceResponse
<
StoreDTO
>
serviceResponse
=
storeApiService
.
getStoreById
(
enterpriseId
,
storeId
);
if
(
serviceResponse
.
isSuccess
())
{
return
RestResponse
.
success
(
serviceResponse
.
getResult
());
}
else
{
return
RestResponse
.
failure
(
serviceResponse
.
getCode
(),
serviceResponse
.
getMessage
());
}
}
}
\ No newline at end of file
gic-store-web/src/main/java/com/gic/store/web/qo/store/StoreQO.java
0 → 100644
View file @
1c2cdd99
package
com
.
gic
.
store
.
web
.
qo
.
store
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* @author zhiwj
* @date 2019/6/28
*/
public
class
StoreQO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
6628043536632590486L
;
/**
*
*/
private
Integer
storeId
;
/**
*
*/
private
Integer
enterpriseId
;
/**
* 门店名称
*/
private
String
storeName
;
/**
* 门店code
*/
private
String
storeCode
;
/**
* 域id
*/
private
Integer
regionId
;
/**
* 门店电话
*/
private
String
conactsPhone
;
/**
* 门店详细地址
*/
private
String
address
;
/**
* 关联门店品牌iid,多个用逗号分隔
*/
private
String
brandIds
;
/**
* 地区id
*/
private
String
areaId
;
/**
* 经度
*/
private
String
longitude
;
/**
* 纬度
*/
private
String
latitude
;
/**
* 溢出状态;默认为0,1标识溢出
*/
private
Integer
overflowStatus
;
/**
* 门店启用状态;1启用 2不启用
*/
private
Integer
status
;
/**
* erp门店状态
*/
private
Integer
erpStatus
;
/**
* 门店类型
*/
private
Integer
storeType
;
/**
*
*/
private
Integer
storeGroupId
;
/**
*
*/
private
Date
createTime
;
/**
*
*/
private
Date
updateTime
;
private
String
photos
;
private
String
delPhotos
;
private
String
delBusinessTimes
;
private
String
businessTimes
;
private
String
storeGroupName
;
public
Integer
getStoreId
()
{
return
storeId
;
}
public
void
setStoreId
(
Integer
storeId
)
{
this
.
storeId
=
storeId
;
}
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
Integer
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
String
getStoreName
()
{
return
storeName
;
}
public
void
setStoreName
(
String
storeName
)
{
this
.
storeName
=
storeName
;
}
public
String
getStoreCode
()
{
return
storeCode
;
}
public
void
setStoreCode
(
String
storeCode
)
{
this
.
storeCode
=
storeCode
;
}
public
Integer
getRegionId
()
{
return
regionId
;
}
public
void
setRegionId
(
Integer
regionId
)
{
this
.
regionId
=
regionId
;
}
public
String
getConactsPhone
()
{
return
conactsPhone
;
}
public
void
setConactsPhone
(
String
conactsPhone
)
{
this
.
conactsPhone
=
conactsPhone
;
}
public
String
getAddress
()
{
return
address
;
}
public
void
setAddress
(
String
address
)
{
this
.
address
=
address
;
}
public
String
getBrandIds
()
{
return
brandIds
;
}
public
void
setBrandIds
(
String
brandIds
)
{
this
.
brandIds
=
brandIds
;
}
public
String
getAreaId
()
{
return
areaId
;
}
public
void
setAreaId
(
String
areaId
)
{
this
.
areaId
=
areaId
;
}
public
String
getLongitude
()
{
return
longitude
;
}
public
void
setLongitude
(
String
longitude
)
{
this
.
longitude
=
longitude
;
}
public
String
getLatitude
()
{
return
latitude
;
}
public
void
setLatitude
(
String
latitude
)
{
this
.
latitude
=
latitude
;
}
public
Integer
getOverflowStatus
()
{
return
overflowStatus
;
}
public
void
setOverflowStatus
(
Integer
overflowStatus
)
{
this
.
overflowStatus
=
overflowStatus
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
Integer
getErpStatus
()
{
return
erpStatus
;
}
public
void
setErpStatus
(
Integer
erpStatus
)
{
this
.
erpStatus
=
erpStatus
;
}
public
Integer
getStoreType
()
{
return
storeType
;
}
public
void
setStoreType
(
Integer
storeType
)
{
this
.
storeType
=
storeType
;
}
public
Integer
getStoreGroupId
()
{
return
storeGroupId
;
}
public
void
setStoreGroupId
(
Integer
storeGroupId
)
{
this
.
storeGroupId
=
storeGroupId
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
String
getPhotos
()
{
return
photos
;
}
public
void
setPhotos
(
String
photos
)
{
this
.
photos
=
photos
;
}
public
String
getDelPhotos
()
{
return
delPhotos
;
}
public
void
setDelPhotos
(
String
delPhotos
)
{
this
.
delPhotos
=
delPhotos
;
}
public
String
getDelBusinessTimes
()
{
return
delBusinessTimes
;
}
public
void
setDelBusinessTimes
(
String
delBusinessTimes
)
{
this
.
delBusinessTimes
=
delBusinessTimes
;
}
public
String
getBusinessTimes
()
{
return
businessTimes
;
}
public
void
setBusinessTimes
(
String
businessTimes
)
{
this
.
businessTimes
=
businessTimes
;
}
public
String
getStoreGroupName
()
{
return
storeGroupName
;
}
public
void
setStoreGroupName
(
String
storeGroupName
)
{
this
.
storeGroupName
=
storeGroupName
;
}
}
gic-store-web/src/main/resources/dubbo-gic-store-web.xml
View file @
1c2cdd99
...
...
@@ -22,5 +22,7 @@
<dubbo:reference
interface=
"com.gic.store.service.StoreGroupApiService"
id=
"storeGroupApiService"
timeout=
"60000"
retries=
"0"
/>
<!--自定义域字段-->
<dubbo:reference
interface=
"com.gic.store.service.StoreFieldApiService"
id=
"storeFieldApiService"
timeout=
"60000"
retries=
"0"
/>
<!--门店-->
<dubbo:reference
interface=
"com.gic.store.service.StoreApiService"
id=
"storeApiService"
timeout=
"60000"
retries=
"0"
/>
</beans>
\ No newline at end of file
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