Skip to content

G
gic-store
Commit 0226ab2a by zhiwj
Options

门店日志

parent 5a663ad9
Showing with 67 additions and 12 deletions
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreMapper.java
......@@ -73,6 +73,8 @@ public interface TabStoreMapper {
List<Integer> listStoreInfoIdByStoreIds(@Param("ids") List<Integer> ids, @Param("enterpriseId") Integer enterpriseId);
List<Integer> listStoredByStoreInfoList(@Param("ids") List<Integer> storeInfoIdList, @Param("enterpriseId") Integer enterpriseId);
List<String> listAllCityId(@Param("enterpriseId") Integer enterpriseId,
@Param("storeBrandId") Integer storeBrandId);
......
gic-store-service/src/main/java/com/gic/store/service/StoreLogService.java
package com.gic.store.service;
import com.gic.enterprise.qo.PageQO;
import com.gic.store.dto.StoreLogDTO;
import com.gic.store.entity.TabStoreLog;
import com.github.pagehelper.Page;
......@@ -39,10 +38,10 @@ public interface StoreLogService {
*/
Page<TabStoreLog> listStoreLog(StoreLogDTO storeLogDTO, Integer currentPage, Integer pageSize);
void saveBulkStoreInfoLog(List<Integer> storeIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content);
void saveBulkStoreInfoLog(List<Integer> storeInfoIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content);
void saveBulkStoreStatusLog(List<Integer> storeIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content);
void saveBulkStoreStatusLog(List<Integer> storeInfoIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content);
void saveBulkStoreGroupLog(List<Integer> storeIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content);
void saveBulkStoreGroupLog(List<Integer> storeInfoIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/service/StoreService.java
......@@ -118,7 +118,8 @@ public interface StoreService {
String listStoreInfoIdByStoreIds(String storeIds, Integer enterpriseId);
List<Integer> listStoredByStoreInfoList(List<Integer> storeInfoIdList, Integer enterpriseId);
/** @Description: 查询企业下所有城市id，门店数量从多到少排序
* @author taogs
* @Date 17:39 2019/12/4
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreLogServiceImpl.java
......@@ -2,13 +2,13 @@ package com.gic.store.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.qo.PageQO;
import com.gic.store.constant.StoreLogReasonEnum;
import com.gic.store.constant.StoreLogTypeEnum;
import com.gic.store.dao.mapper.TabStoreLogMapper;
import com.gic.store.dto.StoreLogDTO;
import com.gic.store.entity.TabStoreLog;
import com.gic.store.service.StoreLogService;
import com.gic.store.service.StoreService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,6 +28,8 @@ public class StoreLogServiceImpl implements StoreLogService {
@Autowired
private TabStoreLogMapper tabStoreLogMapper;
@Autowired
private StoreService storeService;
@Override
public Integer saveStoreLog(StoreLogDTO storeLog) {
......@@ -44,7 +46,7 @@ public class StoreLogServiceImpl implements StoreLogService {
}
@Override
public void saveBulkStoreInfoLog(List<Integer> storeIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content) {
public void saveBulkStoreInfoLog(List<Integer> storeInfoIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content) {
TabStoreLog storeLog = new TabStoreLog();
storeLog.setEnterpriseId(enterpriseId);
storeLog.setReason(StoreLogReasonEnum.WEB.getCode());
......@@ -53,6 +55,7 @@ public class StoreLogServiceImpl implements StoreLogService {
storeLog.setOperatorId(operatorId);
storeLog.setOperatorName(operatorName);
storeLog.setContent(content);
List<Integer> storeIdList = storeService.listStoredByStoreInfoList(storeInfoIdList, enterpriseId);
for (Integer storeId : storeIdList) {
storeLog.setStoreId(storeId);
tabStoreLogMapper.insertSelective(storeLog);
......@@ -60,7 +63,7 @@ public class StoreLogServiceImpl implements StoreLogService {
}
@Override
public void saveBulkStoreStatusLog(List<Integer> storeIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content) {
public void saveBulkStoreStatusLog(List<Integer> storeInfoIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content) {
TabStoreLog storeLog = new TabStoreLog();
storeLog.setEnterpriseId(enterpriseId);
storeLog.setReason(StoreLogReasonEnum.WEB.getCode());
......@@ -69,14 +72,14 @@ public class StoreLogServiceImpl implements StoreLogService {
storeLog.setOperatorId(operatorId);
storeLog.setOperatorName(operatorName);
storeLog.setContent(content);
for (Integer storeId : storeIdList) {
for (Integer storeId : storeInfoIdList) {
storeLog.setStoreId(storeId);
tabStoreLogMapper.insertSelective(storeLog);
}
}
@Override
public void saveBulkStoreGroupLog(List<Integer> storeIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content) {
public void saveBulkStoreGroupLog(List<Integer> storeInfoIdList, Integer enterpriseId, Integer operatorId, String operatorName, String content) {
TabStoreLog storeLog = new TabStoreLog();
storeLog.setEnterpriseId(enterpriseId);
storeLog.setReason(StoreLogReasonEnum.WEB.getCode());
......@@ -85,7 +88,7 @@ public class StoreLogServiceImpl implements StoreLogService {
storeLog.setOperatorId(operatorId);
storeLog.setOperatorName(operatorName);
storeLog.setContent(content);
for (Integer storeId : storeIdList) {
for (Integer storeId : storeInfoIdList) {
storeLog.setStoreId(storeId);
tabStoreLogMapper.insertSelective(storeLog);
}
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java
......@@ -489,6 +489,11 @@ public class StoreServiceImpl implements StoreService {
}
@Override
public List<Integer> listStoredByStoreInfoList(List<Integer> storeInfoIdList, Integer enterpriseId) {
return tabStoreMapper.listStoredByStoreInfoList(storeInfoIdList, enterpriseId);
}
@Override
public List<String> listAllCityId(Integer enterpriseId, Integer storeBrandId) {
return this.tabStoreMapper.listAllCityId(enterpriseId, storeBrandId);
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -43,6 +43,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @author zhiwj
......@@ -1162,6 +1163,7 @@ public class StoreApiServiceImpl implements StoreApiService {
this.bulkAddStoreToIndex(enterpriseId, storeIdList);
}
}
// bulkUpdateLog(storeIds, value, enterpriseId, type, operatorId, operatorName);
} catch (Exception e) {
logger.error("", e);
}
......@@ -1169,6 +1171,37 @@ public class StoreApiServiceImpl implements StoreApiService {
return ServiceResponse.success();
}
// private void bulkUpdateLog(String storeIds, String value, Integer enterpriseId, int type, Integer operatorId, String operatorName) {
// //type表示操作的类型，1更新门店启用状态，2门店电话，3营业时间，4门店照片（替换），5关联品牌，6批量上传图片（原有基础上新增）
// //7批量修改门店分组
// List<Integer> storeIdList;
// if ("all".equals(storeIds)) {
// storeIdList = this.storeService.listAllStoreId(enterpriseId);
// } else {
// storeIdList = Stream.of(storeIds.split(",")).map(Integer::valueOf).collect(Collectors.toList());
// }
// for (Integer storeId : storeIdList) {
// StoreLogDTO storeLogDTO = new StoreLogDTO();
// storeLogDTO.setEnterpriseId(enterpriseId);
// storeLogDTO.setStoreId(storeId);
// storeLogDTO.setReason(StoreLogReasonEnum.WEB.getCode());
// storeLogDTO.setRemark("批量编辑");
// storeLogDTO.setOperatorId(operatorId);
// storeLogDTO.setOperatorName(operatorName);
//
// if (type == 1) {
// storeLogDTO.setLogType(StoreLogTypeEnum.STATUS_UPDATE.getCode());
// } else if (type == 7) {
// storeLogDTO.setLogType(StoreLogTypeEnum.GROUP_UPDATE.getCode());
// } else {
// storeLogDTO.setLogType(StoreLogTypeEnum.INFO_UPDATE.getCode());
// }
// storeLogDTO.setContent("门店新增");
//
// this.storeLogService.saveStoreLog(storeLogDTO);
// }
// }
@Override
public ServiceResponse<StoreDTO> getByStoreNameAndStoreCode(Integer enterpriseId, String storeName, String storeCode) {
StoreDTO store = this.storeService.getByStoreNameAndStoreCode(enterpriseId, storeName, storeCode);
......
gic-store-service/src/main/java/com/gic/store/strategy/impl/StoreStatusStrategyImpl.java
......@@ -30,7 +30,7 @@ public class StoreStatusStrategyImpl implements BulkUpdateStoreStrtegy {
storeInfoIdList.add(Integer.valueOf(s));
}
}
storeLogService.saveBulkStoreInfoLog(storeInfoIdList, enterpriseId, operatorId, operatorName, "门店状态变更为【" + StoreStatusEnum.parseCode(Integer.parseInt(value)) + "】");
storeLogService.saveBulkStoreStatusLog(storeInfoIdList, enterpriseId, operatorId, operatorName, "门店状态变更为【" + StoreStatusEnum.parseCode(Integer.parseInt(value)) + "】");
}
return i;
}
......
gic-store-service/src/main/resources/mapper/TabStoreMapper.xml
......@@ -220,6 +220,17 @@
</foreach>
</if>
</select>
<select id="listStoredByStoreInfoList" resultType="java.lang.Integer">
select store_id
from tab_store where own_type = 0 and enterprise_id = #{enterpriseId}
<if test="null != ids and ids.size &gt; 0">
and store_info_id in
<foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="listAllCityId" resultType="java.lang.String">
select city_id
from tab_store t1,tab_store_info t2
......
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