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
dc61bfe2
Commit
dc61bfe2
authored
May 12, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
cf73ad58
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
32 deletions
+32
-32
ClerkApiService.java
.../src/main/java/com/gic/store/service/ClerkApiService.java
+2
-2
TabStorePhotoMapper.java
...in/java/com/gic/store/dao/mapper/TabStorePhotoMapper.java
+1
-1
StoreService.java
...ice/src/main/java/com/gic/store/service/StoreService.java
+1
-1
StoreServiceImpl.java
...ain/java/com/gic/store/service/impl/StoreServiceImpl.java
+4
-4
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+19
-19
StorePhotoUpdateStrategyImpl.java
...gic/store/strategy/impl/StorePhotoUpdateStrategyImpl.java
+4
-4
TabStorePhotoMapper.xml
...service/src/main/resources/mapper/TabStorePhotoMapper.xml
+1
-1
No files found.
gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java
View file @
dc61bfe2
...
...
@@ -33,7 +33,7 @@ public interface ClerkApiService {
* @Param
* @return
*/
ServiceResponse
<
Integer
>
saveClerkForOrder
(
String
clerkName
,
String
clerkCode
,
Integer
storeId
,
Integer
enterpriseId
,
String
orderNum
);
ServiceResponse
<
Integer
>
saveClerkForOrder
(
String
clerkName
,
String
clerkCode
,
Integer
storeI
nfoI
d
,
Integer
enterpriseId
,
String
orderNum
);
/** @Description: 同步pos会员途经保存导购
* @author taogs
...
...
@@ -41,7 +41,7 @@ public interface ClerkApiService {
* @Param
* @return
*/
ServiceResponse
<
Integer
>
saveClerkForPosMember
(
String
clerkName
,
String
clerkCode
,
Integer
storeId
,
Integer
enterpriseId
,
String
cardNO
);
ServiceResponse
<
Integer
>
saveClerkForPosMember
(
String
clerkName
,
String
clerkCode
,
Integer
storeI
nfoI
d
,
Integer
enterpriseId
,
String
cardNO
);
ServiceResponse
<
Integer
>
saveClerkByStoreInfoIdForOrder
(
String
clerkName
,
String
clerkCode
,
Integer
storeInfoId
,
Integer
enterpriseId
,
String
orderNum
);
...
...
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStorePhotoMapper.java
View file @
dc61bfe2
...
...
@@ -58,7 +58,7 @@ public interface TabStorePhotoMapper {
int
updateAllStorePhoto
(
@Param
(
"imageCode"
)
String
imageCode
,
@Param
(
"imageUrl"
)
String
imageUrl
,
@Param
(
"sort"
)
int
sort
,
@Param
(
"enterpriseId"
)
Integer
enterpriseId
);
int
updatePhotoBystoreInfoIds
(
@Param
(
"imageCode"
)
String
imageCode
,
@Param
(
"imageUrl"
)
String
imageUrl
,
@Param
(
"sort"
)
int
sort
,
@Param
(
"storeI
dList"
)
List
<
Integer
>
storeIdList
);
int
updatePhotoBystoreInfoIds
(
@Param
(
"imageCode"
)
String
imageCode
,
@Param
(
"imageUrl"
)
String
imageUrl
,
@Param
(
"sort"
)
int
sort
,
@Param
(
"storeI
nfoIds"
)
List
<
Integer
>
storeInfoIds
);
int
deleteAllByEnterpriseId
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
);
...
...
gic-store-service/src/main/java/com/gic/store/service/StoreService.java
View file @
dc61bfe2
...
...
@@ -72,7 +72,7 @@ public interface StoreService {
int
bulkUpdateStoreBusinessTime
(
String
storeIds
,
Integer
enterpriseId
,
String
value
);
int
bulkUpdateStorePhoto
(
String
storeIds
,
Integer
enterpriseId
,
String
value
);
int
bulkUpdateStorePhoto
(
String
storeI
nfoI
ds
,
Integer
enterpriseId
,
String
value
);
int
bulkAddStorePhoto
(
String
storeIds
,
Integer
enterpriseId
,
String
value
);
...
...
gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java
View file @
dc61bfe2
...
...
@@ -272,14 +272,14 @@ public class StoreServiceImpl implements StoreService {
}
@Override
public
int
bulkUpdateStorePhoto
(
String
storeIds
,
Integer
enterpriseId
,
String
value
)
{
public
int
bulkUpdateStorePhoto
(
String
storeI
nfoI
ds
,
Integer
enterpriseId
,
String
value
)
{
try
{
JSONArray
array
=
JSON
.
parseArray
(
value
);
List
<
Integer
>
list
=
new
ArrayList
<>();
if
(
"all"
.
equals
(
storeIds
))
{
if
(
"all"
.
equals
(
storeI
nfoI
ds
))
{
this
.
tabStorePhotoMapper
.
deleteAllByEnterpriseId
(
enterpriseId
);
}
else
{
String
[]
storeIdArr
=
storeIds
.
split
(
","
);
String
[]
storeIdArr
=
storeI
nfoI
ds
.
split
(
","
);
for
(
String
s
:
storeIdArr
)
{
list
.
add
(
Integer
.
valueOf
(
s
));
}
...
...
@@ -289,7 +289,7 @@ public class StoreServiceImpl implements StoreService {
JSONObject
json
=
array
.
getJSONObject
(
i
);
String
imageCode
=
json
.
getString
(
"imageCode"
);
String
imageUrl
=
json
.
getString
(
"imageUrl"
);
if
(
"all"
.
equals
(
storeIds
))
{
if
(
"all"
.
equals
(
storeI
nfoI
ds
))
{
this
.
tabStorePhotoMapper
.
updateAllStorePhoto
(
imageCode
,
imageUrl
,
i
,
enterpriseId
);
}
else
{
this
.
tabStorePhotoMapper
.
updatePhotoBystoreInfoIds
(
imageCode
,
imageUrl
,
i
,
list
);
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
dc61bfe2
...
...
@@ -103,30 +103,30 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
@Override
public
ServiceResponse
<
Integer
>
saveClerkForOrder
(
String
clerkName
,
String
clerkCode
,
Integer
storeId
,
public
ServiceResponse
<
Integer
>
saveClerkForOrder
(
String
clerkName
,
String
clerkCode
,
Integer
storeI
nfoI
d
,
Integer
enterpriseId
,
String
orderNum
)
{
ServiceResponse
<
StoreDTO
>
storeResponse
=
storeApiService
.
getStoreById
(
enterpriseId
,
store
Id
);
if
(
storeResponse
.
getResult
()
!=
null
)
{
StoreDTO
store
=
storeResponse
.
getResult
();
// ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreById(enterpriseId, storeInfo
Id);
//
if (storeResponse.getResult() != null) {
//
StoreDTO store = storeResponse.getResult();
ClerkDTO
clerkDTO
=
new
ClerkDTO
();
clerkDTO
.
setClerkName
(
clerkName
);
clerkDTO
.
setClerkCode
(
clerkCode
);
clerkDTO
.
setEnterpriseId
(
enterpriseId
);
clerkDTO
.
setStoreInfoId
(
store
.
getStoreInfoId
()
);
clerkDTO
.
setStoreInfoId
(
store
InfoId
);
clerkDTO
.
setReason
(
ClerkLogReasonEnum
.
ORDER
.
getCode
());
clerkDTO
.
setRemark
(
"订单号:"
+
orderNum
);
clerkDTO
.
setStoreName
(
store
.
getStoreName
());
//
clerkDTO.setStoreName(store.getStoreName());
ServiceResponse
serviceResponse
=
this
.
saveOrUpdate
(
clerkDTO
);
return
serviceResponse
;
}
else
{
logger
.
warn
(
"门店不存在 enterpriseId:{}, storeId:{}"
,
enterpriseId
,
store
Id
);
return
EnterpriseServiceResponse
.
failure
(
ErrorCode
.
NOTEXISTS
.
getCode
(),
"门店不存在"
);
}
//
} else {
// logger.warn("门店不存在 enterpriseId:{}, storeId:{}", enterpriseId, storeInfo
Id);
//
return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店不存在");
//
}
}
@Override
public
ServiceResponse
<
Integer
>
saveClerkForPosMember
(
String
clerkName
,
String
clerkCode
,
Integer
storeId
,
Integer
enterpriseId
,
String
cardNO
)
{
ServiceResponse
<
StoreDTO
>
storeResponse
=
storeApiService
.
getStoreById
(
enterpriseId
,
storeId
);
public
ServiceResponse
<
Integer
>
saveClerkForPosMember
(
String
clerkName
,
String
clerkCode
,
Integer
storeI
nfoI
d
,
Integer
enterpriseId
,
String
cardNO
)
{
ServiceResponse
<
StoreDTO
>
storeResponse
=
storeApiService
.
getStoreById
(
enterpriseId
,
storeI
nfoI
d
);
if
(
storeResponse
.
getResult
()
!=
null
)
{
StoreDTO
store
=
storeResponse
.
getResult
();
ClerkDTO
clerkDTO
=
new
ClerkDTO
();
...
...
@@ -140,15 +140,15 @@ public class ClerkApiServiceImpl implements ClerkApiService {
ServiceResponse
serviceResponse
=
this
.
saveOrUpdate
(
clerkDTO
);
return
serviceResponse
;
}
else
{
logger
.
warn
(
"门店不存在 enterpriseId:{}, storeId:{}"
,
enterpriseId
,
storeId
);
logger
.
warn
(
"门店不存在 enterpriseId:{}, storeId:{}"
,
enterpriseId
,
storeI
nfoI
d
);
return
EnterpriseServiceResponse
.
failure
(
ErrorCode
.
NOTEXISTS
.
getCode
(),
"门店不存在"
);
}
}
@Override
public
ServiceResponse
<
Integer
>
saveClerkByStoreInfoIdForOrder
(
String
clerkName
,
String
clerkCode
,
Integer
storeInfoId
,
Integer
enterpriseId
,
String
orderNum
)
{
Integer
storeId
=
this
.
storeService
.
getStoreIdByStoreInfoId
(
enterpriseId
,
storeInfoId
);
if
(
storeId
!=
null
)
{
//
Integer storeId = this.storeService.getStoreIdByStoreInfoId(enterpriseId, storeInfoId);
//
if (storeId != null) {
ClerkDTO
clerkDTO
=
new
ClerkDTO
();
clerkDTO
.
setClerkName
(
clerkName
);
clerkDTO
.
setClerkCode
(
clerkCode
);
...
...
@@ -158,10 +158,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
clerkDTO
.
setRemark
(
"订单号:"
+
orderNum
);
ServiceResponse
serviceResponse
=
this
.
saveOrUpdate
(
clerkDTO
);
return
serviceResponse
;
}
else
{
logger
.
warn
(
"门店不存在 enterpriseId:{}, storeInfoId:{}"
,
enterpriseId
,
storeInfoId
);
return
EnterpriseServiceResponse
.
failure
(
ErrorCode
.
NOTEXISTS
.
getCode
(),
"门店不存在"
);
}
//
} else {
//
logger.warn("门店不存在 enterpriseId:{}, storeInfoId:{}", enterpriseId, storeInfoId);
//
return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店不存在");
//
}
}
@Override
...
...
gic-store-service/src/main/java/com/gic/store/strategy/impl/StorePhotoUpdateStrategyImpl.java
View file @
dc61bfe2
...
...
@@ -15,15 +15,15 @@ public class StorePhotoUpdateStrategyImpl implements BulkUpdateStoreStrtegy {
private
StoreLogService
storeLogService
;
@Override
public
int
bulkUpdateStore
(
String
storeIds
,
Integer
enterpriseId
,
String
value
,
StoreService
storeService
,
Integer
operatorId
,
String
operatorName
)
{
int
i
=
storeService
.
bulkUpdateStorePhoto
(
storeIds
,
enterpriseId
,
value
);
public
int
bulkUpdateStore
(
String
storeI
nfoI
ds
,
Integer
enterpriseId
,
String
value
,
StoreService
storeService
,
Integer
operatorId
,
String
operatorName
)
{
int
i
=
storeService
.
bulkUpdateStorePhoto
(
storeI
nfoI
ds
,
enterpriseId
,
value
);
if
(
i
>
0
)
{
List
<
Integer
>
storeIdList
;
if
(
"all"
.
equals
(
storeIds
))
{
if
(
"all"
.
equals
(
storeI
nfoI
ds
))
{
storeIdList
=
storeService
.
listAllStoreId
(
enterpriseId
);
}
else
{
storeIdList
=
new
ArrayList
<>();
String
[]
storeIdArr
=
storeIds
.
split
(
","
);
String
[]
storeIdArr
=
storeI
nfoI
ds
.
split
(
","
);
for
(
String
s
:
storeIdArr
)
{
storeIdList
.
add
(
Integer
.
valueOf
(
s
));
}
...
...
gic-store-service/src/main/resources/mapper/TabStorePhotoMapper.xml
View file @
dc61bfe2
...
...
@@ -160,7 +160,7 @@
)
select store_info_id,enterprise_id,#{imageCode},#{imageUrl},#{sort},1,now(),now() from tab_store where overflow_status=0
and store_info_id in
<foreach
collection=
"storeInfoId
List
"
index=
"index"
item=
"storeInfoId"
open=
"("
separator=
","
close=
")"
>
<foreach
collection=
"storeInfoId
s
"
index=
"index"
item=
"storeInfoId"
open=
"("
separator=
","
close=
")"
>
#{storeInfoId}
</foreach>
</insert>
...
...
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