Skip to content

G
gic-store
Commit a6858542 by guojuxing
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 72e7eb28 5774443b
Showing with 133 additions and 7 deletions
gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java
......@@ -53,6 +53,10 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
* 小程序默认图片
*/
private StorePhotoDTO defaultPhoto;
private String completeStatusName;
private String statusName;
private String erpStatusName;
private String storeTypeName;
public Integer getStoreId() {
return storeId;
......@@ -197,4 +201,36 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
public void setLicense(Integer license) {
this.license = license;
}
public void setCompleteStatusName(String completeStatusName) {
this.completeStatusName = completeStatusName;
}
public String getCompleteStatusName() {
return completeStatusName;
}
public void setStatusName(String statusName) {
this.statusName = statusName;
}
public String getStatusName() {
return statusName;
}
public void setErpStatusName(String erpStatusName) {
this.erpStatusName = erpStatusName;
}
public String getErpStatusName() {
return erpStatusName;
}
public void setStoreTypeName(String storeTypeName) {
this.storeTypeName = storeTypeName;
}
public String getStoreTypeName() {
return storeTypeName;
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java
......@@ -83,6 +83,18 @@ public interface StoreApiService {
ServiceResponse<Map<Integer, List<String>>> listStorePhotoByStoreIds(Integer enterpriseId, List<Integer> storeIdList);
/**
* 按id查询门店图片 key：storeInfoIdList value:门店图片列表
* @Title: listStorePhotoByIds
* @Description:
* @author zhiwj
* @param enterpriseId
* @param storeInfoIdList
* @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.Integer,java.util.List<java.lang.String>>>
* @throws
*/
ServiceResponse<Map<Integer, List<String>>> listStorePhotoByStoreInfoIds(Integer enterpriseId, List<Integer> storeInfoIdList);
/**
* @Title: getStoreById
* @Description: 查询门店详情
* @author zhiwj
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -529,6 +529,30 @@ public class StoreApiServiceImpl implements StoreApiService {
}
@Override
public ServiceResponse<Map<Integer, List<String>>> listStorePhotoByStoreInfoIds(Integer enterpriseId, List<Integer> storeInfoIdList) {
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(enterpriseId);
storeSearchDTO.setStoreInfoIds(Joiner.on(" ").join(storeInfoIdList));
ServiceResponse<Page<StoreDTO>> serviceResponse = this.listStore(storeSearchDTO, 1, 20);
if (!serviceResponse.isSuccess()) {
return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
Map<Integer, List<String>> resultMap = new HashMap<>(16);
List<StoreDTO> storeDTOList = serviceResponse.getResult().getResult();
for (StoreDTO storeDTO : storeDTOList) {
List<StorePhotoDTO> photoList = storeDTO.getPhotoList();
List<String> list = Optional.ofNullable(photoList).orElse(Collections.emptyList()).stream().map(StorePhotoDTO::getImageUrl).collect(Collectors.toList());
// 给一个门店图片默认值测试
if (CollectionUtils.isNotEmpty(list)) {
list = Arrays.asList(Constants.DEFAULT_PHOTO);
}
resultMap.put(storeDTO.getStoreInfoId(), list);
}
return EnterpriseServiceResponse.success(resultMap);
}
@Override
public ServiceResponse queryStoreFromES(JSONObject jsonObject, Integer pageNum, Integer pageSize, JSONObject sortJson, String returnFileds) {
if (StringUtils.isBlank(returnFileds)) {
returnFileds = StoreESFieldsEnum.STOREID.getField();
......
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java
......@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author zhiwj
......@@ -153,6 +154,12 @@ public class ClerkController extends DownloadUtils {
@RequestMapping("clerk-qrcode-download")
public RestResponse clerkQrcodeDownload(@RequestBody ClerkQrcodeQO clerkQrcodeQO){
List<com.gic.store.web.qo.store.QrcodeContent> list = clerkQrcodeQO.getContent();
if (CollectionUtils.isNotEmpty(list)) {
clerkQrcodeQO.setContent(list.stream().filter(Objects::nonNull).collect(Collectors.toList()));
}
int total = 0;
if(clerkQrcodeQO.getIsAll() == 1){
ClerkSearchDTO clerkSearchDTO = clerkQrcodeQO.getClerkSearchDTO();
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
......@@ -327,9 +327,13 @@ public class StoreController extends DownloadUtils {
if (type == 1 && toStoreId != null) {
// 如果是批量修改状态 要转移门店
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
storeSearchDTO.setStoreIds(storeIds.replace(',', ' '));
List<String> list = this.storeApiService.listStore(storeSearchDTO, 1, 1000, "storeInfoId").getResult().getResult()
.stream().map(e -> e.getStoreInfoId().toString()).collect(Collectors.toList());
Page<StoreDTO> page = this.storeApiService.listStore(storeSearchDTO, 1, 1000, "storeInfoId").getResult();
if (page == null || page.getResult() == null) {
return EnterpriseRestResponse.failure(ErrorCode.NOTEXISTS);
}
List<String> list = page.getResult().stream().map(e -> e.getStoreInfoId().toString()).collect(Collectors.toList());
Integer storeInfoId = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), toStoreId).getResult().getStoreInfoId();
StoreBatchUpdateDTO storeBatchUpdateDTO = new StoreBatchUpdateDTO();
storeBatchUpdateDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
......@@ -392,11 +396,12 @@ public class StoreController extends DownloadUtils {
String path = RequestContext.getContext().getRequest().getSession().getServletContext().getRealPath("/excel/csv/collaborator/file/");
List<String> nameList = new ArrayList<>();
List<StoreListSourceVO> listSource = this.getStoreAllListSource(UserDetailUtils.getUserDetail().getEnterpriseId());
for(StoreListSourceVO vo : listSource){
if(storeExportQO.getFieldCodeList().contains(vo.getValue())){
nameList.add(vo.getKey());
}
Map<String, String> map = listSource.stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
for (String fieldCode: storeExportQO.getFieldCodeList()) {
nameList.add(map.get(fieldCode));
}
List<String> fieldCodeList = storeExportQO.getFieldCodeList();
ExecutorPoolSingleton.getInstance().executeTask(new Runnable() {
@Override
public void run() {
......@@ -406,11 +411,49 @@ public class StoreController extends DownloadUtils {
ServiceResponse<Page<StoreDTO>> pageServiceResponse = storeApiService.listStore(storeExportQO, pageNum, 1000);
List<StoreDTO> list = pageServiceResponse.getResult().getResult();
convertCustomField(list);
convertStatusName(fieldCodeList, list);
return list;
}
private void convertStatusName(List<String> fieldCodeList, List<StoreDTO> list) {
if (CollectionUtils.isNotEmpty(list)) {
int completeStatusIndex = fieldCodeList.indexOf("completeStatus");
if (completeStatusIndex != -1) {
fieldCodeList.set(completeStatusIndex, "completeStatusName");
for (StoreDTO e : list) {
e.setCompleteStatusName(e.getCompleteStatus() == null ? "未知" : (e.getCompleteStatus() == 1 ? "已完善" : "未完善"));
}
}
int statusIndex = fieldCodeList.indexOf("status");
if (statusIndex != -1) {
fieldCodeList.set(statusIndex, "statusName");
for (StoreDTO e : list) {
e.setStatusName(e.getStatus() == null ? "未知" : (e.getStatus() == 1 ? "已启用" : "未启用"));
}
}
int erpStatusIndex = fieldCodeList.indexOf("erpStatus");
if (erpStatusIndex != -1) {
fieldCodeList.set(erpStatusIndex, "erpStatusName");
Map<Integer, String> erpStatusMap = storeDictApiService.listAllStoreStatus(list.get(0).getEnterpriseId())
.getResult().stream().collect(Collectors.toMap(e -> Integer.valueOf(e.getValue()), StoreDictDTO::getKey));
for (StoreDTO e : list) {
e.setErpStatusName(erpStatusMap.get(e.getErpStatus()));
}
}
int storeTypeIndex = fieldCodeList.indexOf("storeType");
if (storeTypeIndex != -1) {
fieldCodeList.set(storeTypeIndex, "storeTypeName");
Map<Integer, String> storeTypeMap = storeDictApiService.listAllStoreType(list.get(0).getEnterpriseId())
.getResult().stream().collect(Collectors.toMap(e -> Integer.valueOf(e.getValue()), StoreDictDTO::getKey));
for (StoreDTO e : list) {
e.setStoreTypeName(storeTypeMap.get(e.getStoreType()));
}
}
}
}
};
try {
download(path, downloadReport, storeExportQO.getFileName(), storeExportQO.getExcelExtension(), nameList, storeExportQO.getFieldCodeList(),loader, null, null);
download(path, downloadReport, storeExportQO.getFileName(), storeExportQO.getExcelExtension(), nameList, fieldCodeList, loader, null, null);
} catch (Exception e) {
logger.error("异常", e);
}
......@@ -508,6 +551,7 @@ public class StoreController extends DownloadUtils {
public RestResponse transferStoreMember(String storeId, Integer toStoreId){
// 把参数改成storeInfoId
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
List<StoreDTO> storeInfoList;
if (StringUtils.equals(storeId, "all")) {
storeInfoList = this.storeApiService.listStore(storeSearchDTO, 1, 10000, "storeInfoId").getResult().getResult();
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreTagController.java
......@@ -6,6 +6,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.ano.IgnoreLogin;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.utils.ResultControllerUtils;
......@@ -93,6 +94,7 @@ public class StoreTagController {
}
@RequestMapping("/template-download")
@IgnoreLogin
public Object download(HttpServletRequest request, HttpServletResponse response) throws Exception {
String fileName = " 门店标签批量导入模板.xlsx";
......
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