Commit dc61bfe2 by zhiwj

修改bug

parent cf73ad58
......@@ -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 storeInfoId, 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 storeInfoId, Integer enterpriseId, String cardNO);
ServiceResponse<Integer> saveClerkByStoreInfoIdForOrder(String clerkName, String clerkCode, Integer storeInfoId, Integer enterpriseId, String orderNum);
......
......@@ -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("storeIdList") List<Integer> storeIdList);
int updatePhotoBystoreInfoIds(@Param("imageCode") String imageCode, @Param("imageUrl")String imageUrl, @Param("sort") int sort, @Param("storeInfoIds") List<Integer> storeInfoIds);
int deleteAllByEnterpriseId(@Param("enterpriseId") Integer enterpriseId);
......
......@@ -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 storeInfoIds, Integer enterpriseId, String value);
int bulkAddStorePhoto(String storeIds, Integer enterpriseId, String value);
......
......@@ -272,14 +272,14 @@ public class StoreServiceImpl implements StoreService {
}
@Override
public int bulkUpdateStorePhoto(String storeIds, Integer enterpriseId, String value) {
public int bulkUpdateStorePhoto(String storeInfoIds, Integer enterpriseId, String value) {
try {
JSONArray array = JSON.parseArray(value);
List<Integer> list = new ArrayList<>();
if ("all".equals(storeIds)) {
if ("all".equals(storeInfoIds)) {
this.tabStorePhotoMapper.deleteAllByEnterpriseId(enterpriseId);
} else {
String[] storeIdArr = storeIds.split(",");
String[] storeIdArr = storeInfoIds.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(storeInfoIds)) {
this.tabStorePhotoMapper.updateAllStorePhoto(imageCode, imageUrl, i, enterpriseId);
} else {
this.tabStorePhotoMapper.updatePhotoBystoreInfoIds(imageCode, imageUrl, i, list);
......
......@@ -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 storeInfoId,
Integer enterpriseId, String orderNum) {
ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreById(enterpriseId, storeId);
if (storeResponse.getResult() != null) {
StoreDTO store = storeResponse.getResult();
// ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreById(enterpriseId, storeInfoId);
// 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(storeInfoId);
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, storeId);
return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店不存在");
}
// } else {
// logger.warn("门店不存在 enterpriseId:{}, storeId:{}", enterpriseId, storeInfoId);
// 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 storeInfoId, Integer enterpriseId, String cardNO) {
ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreById(enterpriseId, storeInfoId);
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, storeInfoId);
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
......
......@@ -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 storeInfoIds, Integer enterpriseId, String value, StoreService storeService, Integer operatorId, String operatorName) {
int i = storeService.bulkUpdateStorePhoto(storeInfoIds, enterpriseId, value);
if (i > 0) {
List<Integer> storeIdList;
if ("all".equals(storeIds)) {
if ("all".equals(storeInfoIds)) {
storeIdList = storeService.listAllStoreId(enterpriseId);
} else {
storeIdList = new ArrayList<>();
String[] storeIdArr = storeIds.split(",");
String[] storeIdArr = storeInfoIds.split(",");
for (String s : storeIdArr) {
storeIdList.add(Integer.valueOf(s));
}
......
......@@ -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="storeInfoIdList" index="index" item="storeInfoId" open="(" separator="," close=")">
<foreach collection="storeInfoIds" index="index" item="storeInfoId" open="(" separator="," close=")">
#{storeInfoId}
</foreach>
</insert>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment