Skip to content

G
gic-store
Commit 7bbc094d by 陶光胜
Options

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer 

# Conflicts:
#	gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
parents 8d7cb553 1af07722
Showing with 197 additions and 76 deletions
gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java
......@@ -23,6 +23,7 @@ public class StoreSearchDTO implements Serializable {
private Long storeResource;
private Integer currentPage=1;
private Integer pageSize=20;
private Integer storeTagId;
public Integer getStoreGroupId() {
return storeGroupId;
......@@ -183,4 +184,12 @@ public class StoreSearchDTO implements Serializable {
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public Integer getStoreTagId() {
return storeTagId;
}
public void setStoreTagId(Integer storeTagId) {
this.storeTagId = storeTagId;
}
}
gic-store-api/src/main/java/com/gic/store/service/StoreOpenApiService.java
......@@ -47,7 +47,7 @@ public interface StoreOpenApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> addStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO);
ServiceResponse<String> addStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO);
/**
......@@ -60,7 +60,7 @@ public interface StoreOpenApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> editStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO);
ServiceResponse<String> editStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO);
/**
* 门店列表接口
......@@ -72,7 +72,7 @@ public interface StoreOpenApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> pageStore(Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize);
ServiceResponse<String> pageStore(String appId, Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize);
/**
......
gic-store-api/src/main/java/com/gic/store/service/StoreTagTmpApiService.java
package com.gic.store.service;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.store.dto.StoreTagTmpDTO;
......@@ -15,4 +16,6 @@ public interface StoreTagTmpApiService {
ServiceResponse<Void> saveStoreTagTmp(StoreTagTmpDTO bean);
ServiceResponse<Page<StoreTagTmpDTO>> listImportError(Integer enterpriseId, Integer currentPage, Integer pageSize);
ServiceResponse<JSONObject> queryCount(Integer enterpriseId);
}
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBusinessTimeMapper.java
......@@ -64,5 +64,5 @@ public interface TabStoreBusinessTimeMapper {
int deleteAllByEnterpriseId(@Param("enterpriseId") Integer enterpriseId);
int deleteBystoreInfoIds(@Param("enterpriseId") Integer enterpriseId, @Param("storeIdList") List<Integer> storeIdList);
int deleteBystoreInfoIds(@Param("enterpriseId") Integer enterpriseId, @Param("storeInfoIdList") List<Integer> storeIdList);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreExtendMapper.java
......@@ -61,4 +61,6 @@ public interface TabStoreExtendMapper {
int countStoreExtendStoreField(@Param("storeField") Integer storeField, @Param("storeFieldSelectId") Integer storeFieldSelectId);
int countExtendByValue(@Param("storeFieldId") Integer storeFieldId, @Param("value") String value, @Param("storeExtendId") Integer storeExtendId);
void delete(@Param("enterpriseId") Integer enterpriseId, @Param("storeInfoId") Integer storeInfoId);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStorePhotoMapper.java
......@@ -3,7 +3,6 @@ package com.gic.store.dao.mapper;
import com.gic.store.entity.TabStorePhoto;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface TabStorePhotoMapper {
......@@ -63,7 +62,7 @@ public interface TabStorePhotoMapper {
int deleteAllByEnterpriseId(@Param("enterpriseId") Integer enterpriseId);
int deleteBystoreInfoIds(@Param("enterpriseId") Integer enterpriseId, @Param("storeIdList") List<Integer> storeIdList);
int deleteBystoreInfoIds(@Param("enterpriseId") Integer enterpriseId, @Param("storeInfoIdList") List<Integer> storeIdList);
int addAllStorePhoto(@Param("imageCode") String imageCode, @Param("imageUrl")String imageUrl, @Param("sort") int sort, @Param("enterpriseId") Integer enterpriseId);
......
gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreTagTmpMapper.java
......@@ -56,4 +56,6 @@ public interface TabStoreTagTmpMapper {
void delStoreTagTmp(@Param("enterpriseId") Integer enterpriseId);
Page<TabStoreTagTmp> listImportError(@Param("enterpriseId") Integer enterpriseId);
Integer querySuccessCount(@Param("enterpriseId") Integer enterpriseId);
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/service/StoreTagTmpService.java
......@@ -15,4 +15,6 @@ public interface StoreTagTmpService {
void saveStoreTagTmp(StoreTagTmpDTO bean);
Page<TabStoreTagTmp> listImportError(Integer enterpriseId, Integer currentPage, Integer pageSize);
Integer querySuccessCount(Integer enterpriseId);
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreBusinessTimeServiceImpl.java
......@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
......@@ -30,11 +31,12 @@ public class StoreBusinessTimeServiceImpl implements StoreBusinessTimeService {
@Override
@Transactional(rollbackFor = Exception.class)
public void editStoreBusinessTime(Integer enterpriseId, Integer storeInfoId, List<StoreBusinessTimeDTO> businessTimeList, List<Integer> delBusinessTimes) {
if (CollectionUtils.isNotEmpty(delBusinessTimes)) {
for (Integer delId : delBusinessTimes) {
tabStoreBusinessTimeMapper.deleteByPrimaryKey(delId);
}
}
// if (CollectionUtils.isNotEmpty(delBusinessTimes)) {
// for (Integer delId : delBusinessTimes) {
// tabStoreBusinessTimeMapper.deleteByPrimaryKey(delId);
// }
// }
tabStoreBusinessTimeMapper.deleteBystoreInfoIds(enterpriseId, Collections.singletonList(storeInfoId));
if (CollectionUtils.isNotEmpty(businessTimeList)) {
for (StoreBusinessTimeDTO storeBusinessTimeDTO : businessTimeList) {
if (StringUtils.isNotBlank(storeBusinessTimeDTO.getWeekday())) {
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreExtendServiceImpl.java
package com.gic.store.service.impl;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSON;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.error.ErrorCode;
......@@ -21,6 +11,15 @@ import com.gic.store.entity.TabStoreField;
import com.gic.store.service.StoreExtendService;
import com.gic.store.service.StoreFieldService;
import com.gic.store.utils.field.FieldBase;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
/**
* @author zhiwj
......@@ -39,6 +38,9 @@ public class StoreExtendServiceImpl implements StoreExtendService {
@Transactional(rollbackFor = Exception.class)
public void saveOrUpdate(Integer enterpriseId, Integer storeInfoId, List<StoreExtendDTO> storeExtendList) {
if (CollectionUtils.isNotEmpty(storeExtendList)) {
this.tabStoreExtendMapper.delete(enterpriseId, storeInfoId);
List<TabStoreExtend> tabStoreExtendList = EntityUtil.changeEntityListByOrika(TabStoreExtend.class, storeExtendList);
for (TabStoreExtend tabStoreExtend : tabStoreExtendList) {
TabStoreField field = storeFieldService.getStoreFieldById(tabStoreExtend.getStoreFieldId());
......@@ -56,12 +58,12 @@ public class StoreExtendServiceImpl implements StoreExtendService {
tabStoreExtend.setEnterpriseId(enterpriseId);
tabStoreExtend.setStoreInfoId(storeInfoId);
if (tabStoreExtend.getStoreExtendId() == null) {
tabStoreExtend.setCreateTime(new Date());
tabStoreExtendMapper.insertSelective(tabStoreExtend);
} else {
tabStoreExtendMapper.updateByPrimaryKeySelective(tabStoreExtend);
}
// if (tabStoreExtend.getStoreExtendId() == null) {
tabStoreExtend.setCreateTime(new Date());
tabStoreExtendMapper.insertSelective(tabStoreExtend);
// } else {
// tabStoreExtendMapper.updateByPrimaryKeySelective(tabStoreExtend);
// }
}
}
}
......
gic-store-service/src/main/java/com/gic/store/service/impl/StorePhotoServiceImpl.java
......@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
......@@ -26,14 +27,17 @@ public class StorePhotoServiceImpl implements StorePhotoService {
@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);
}
}
// if (CollectionUtils.isNotEmpty(delPhotos)) {
// for (Integer delId : delPhotos) {
// TabStorePhoto storePhoto = new TabStorePhoto();
// storePhoto.setStorePhotoId(delId);
// storePhoto.setStatus(GlobalInfo.DATA_STATUS_DELETE);
// tabStorePhotoMapper.updateByPrimaryKeySelective(storePhoto);
// }
// }
// 删除老的
tabStorePhotoMapper.deleteBystoreInfoIds(enterpriseId, Collections.singletonList(storeId));
if (CollectionUtils.isNotEmpty(photoList)) {
for (int i = 0; i < photoList.size(); i++) {
StorePhotoDTO storePhotoDTO = photoList.get(i);
......
gic-store-service/src/main/java/com/gic/store/service/impl/StoreTagTmpServiceImpl.java
......@@ -37,4 +37,9 @@ public class StoreTagTmpServiceImpl implements StoreTagTmpService {
PageHelper.startPage(currentPage, pageSize);
return tabStoreTagTmpMapper.listImportError(enterpriseId);
}
@Override
public Integer querySuccessCount(Integer enterpriseId) {
return tabStoreTagTmpMapper.querySuccessCount(enterpriseId);
}
}
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -263,22 +263,22 @@ public class StoreApiServiceImpl implements StoreApiService {
.append("变更为【").append(newStore.getLongitude()).append(",").append(newStore.getLatitude()).append("】");
}
}
if (!CollectionUtils.isEqualCollection(oldStore.getStoreExtendList(), newStore.getStoreExtendList())) {
for (int i = 0; i < newStore.getStoreExtendList().size(); i++) {
StoreExtendDTO newStoreExtend = newStore.getStoreExtendList().get(i);
if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
Integer fieldType = newStoreExtend.getStoreFieldType();
if (StoreFieldTypeEnum.RADIO.getCode() == fieldType || StoreFieldTypeEnum.CHECK.getCode() == fieldType) {
if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
TabStoreFieldSelect select = storeFieldSelectService.getStoreFieldSelectById(Integer.parseInt(newStoreExtend.getValue()));
sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(select.getStoreFieldSelectName()).append("】");
}
} else {
sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(newStoreExtend.getValue()).append("】");
}
}
}
}
// if (!CollectionUtils.isEqualCollection(oldStore.getStoreExtendList(), newStore.getStoreExtendList())) {
// for (int i = 0; i < newStore.getStoreExtendList().size(); i++) {
// StoreExtendDTO newStoreExtend = newStore.getStoreExtendList().get(i);
// if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
// Integer fieldType = newStoreExtend.getStoreFieldType();
// if (StoreFieldTypeEnum.RADIO.getCode() == fieldType || StoreFieldTypeEnum.CHECK.getCode() == fieldType) {
// if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
// TabStoreFieldSelect select = storeFieldSelectService.getStoreFieldSelectById(Integer.parseInt(newStoreExtend.getValue()));
// sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(select.getStoreFieldSelectName()).append("】");
// }
// } else {
// sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(newStoreExtend.getValue()).append("】");
// }
// }
// }
// }
storeLogDTO.setContent(sb.toString());
if (StringUtils.isNotBlank(storeLogDTO.getContent().trim())) {
this.storeLogService.saveStoreLog(storeLogDTO);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java
......@@ -123,8 +123,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
@Override
@GatewayParams(query = {"enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> addStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
@GatewayParams(query = {"appId","enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> addStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
LOGGER.info("对外API新增门店参数：{}", JSON.toJSONString(storeOpenDTO));
ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
if (!enterpriseResult.isSuccess()) {
......@@ -144,6 +144,10 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
if (StringUtils.isBlank(storeOpenDTO.getBrand())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店招品牌不能为空");
}
// 校验权限
if (!hasAuth(appId, enterpriseId, storeOpenDTO.getStoreCode(), storeOpenDTO.getRegionId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
}
// 校验门店类型
if (storeOpenDTO.getErpType() != null) {
......@@ -287,6 +291,9 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
for (int i = 0; i < fieldList.size(); i++) {
StoreExtendDTO storeExtendDTO = new StoreExtendDTO();
storeExtendDTO.setStoreFieldId(fieldList.get(i).getStoreFieldId());
storeExtendDTO.setStoreFieldType(fieldList.get(i).getStoreFieldType());
storeExtendDTO.setStoreFieldName(fieldList.get(i).getStoreFieldName());
storeExtendDTO.setStoreFieldCode(fieldList.get(i).getStoreFieldCode());
for (JSONObject storeFieldObject : customFieldList) {
if (fieldList.get(i).getStoreFieldName().equals(storeFieldObject.getString("fieldName"))) {
storeExtendDTO.setValue(storeFieldObject.getString("fieldValue"));
......@@ -323,8 +330,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
@Override
@GatewayParams(query = {"enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> editStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
@GatewayParams(query = {"appId", "enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> editStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
if (!enterpriseResult.isSuccess()) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID错误，无此商户");
......@@ -341,12 +348,18 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
} else {
return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店不存在");
}
return this.addStore(enterpriseId, storeOpenDTO);
// 校验权限
if (!hasAuth(appId, enterpriseId, storeOpenDTO.getStoreCode(), storeOpenDTO.getRegionId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
}
return this.addStore(appId, enterpriseId, storeOpenDTO);
}
@Override
@GatewayParams(query = {"enterpriseId", "regionId", "pageNum", "pageSize"})
public ServiceResponse<String> pageStore(Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize) {
@GatewayParams(query = {"appId", "enterpriseId", "regionId", "pageNum", "pageSize"})
public ServiceResponse<String> pageStore(String appId, Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize) {
if (enterpriseId == null) {
return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户id不能为空");
}
......@@ -356,10 +369,16 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(enterpriseId);
storeSearchDTO.setRegionId(regionId);
ServiceResponse<Page<StoreDTO>> serviceResponse = this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize);
if (!serviceResponse.isSuccess()) {
return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
// 校验权限
if (!hasAuth(appId, enterpriseId, null, regionId)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
}
String storeIds = getStoreIds(appId, enterpriseId, regionId).toString();
if (StringUtils.isBlank(storeIds)) {
return ServiceResponse.success(JSON.toJSONString(new Page()));
}
storeSearchDTO.setStoreIds(storeIds);
if (pageNum == null) {
pageNum = 1;
......@@ -368,6 +387,10 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
pageSize = 20;
}
ServiceResponse<Page<StoreDTO>> serviceResponse = this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize);
if (!serviceResponse.isSuccess()) {
return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
Page<StoreDTO> page = serviceResponse.getResult();
return ServiceResponse.success(JSON.toJSONString(page));
}
......@@ -599,7 +622,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
}
if (regionId != null) {
if (regionMap.containsKey(storeCode)) {
if (regionMap.containsKey(regionId.toString())) {
return true;
}
}
......@@ -619,7 +642,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
if (CollectionUtils.isNotEmpty(list)) {
for (StoreDTO storeDTO : list) {
if (storeDTO.getRegionId().intValue() == regionId.intValue()) {
storeIds.append(storeDTO.getStoreId()).append(",");
storeIds.append(storeDTO.getStoreId()).append(" ");
}
}
}
......@@ -648,7 +671,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
Long storeResourceId = resourceResult.getResult().getStoreResource();
//查询门店资源组所有的门店权限
ServiceResponse<Page<StoreDTO>> storeResult = storeWidgetApiService
.listStoreByStoreWidgetId(enterpriseId, storeResourceId.intValue(), 0, 10000);
.listStoreByStoreWidgetId(enterpriseId, storeResourceId.intValue(), 1, 10000);
if (storeResult.isSuccess()) {
Page<StoreDTO> page = storeResult.getResult();
if (page == null) {
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreTagTmpApiServiceImpl.java
package com.gic.store.service.outer.impl;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.PageHelperUtils;
......@@ -39,4 +40,12 @@ public class StoreTagTmpApiServiceImpl implements StoreTagTmpApiService {
com.github.pagehelper.Page<TabStoreTagTmp> page = this.storeTagTmpService.listImportError(enterpriseId, currentPage, pageSize);
return EnterpriseServiceResponse.success(PageHelperUtils.changePageHelperToCurrentPage(page, StoreTagTmpDTO.class));
}
@Override
public ServiceResponse<JSONObject> queryCount(Integer enterpriseId) {
Integer successCount = this.storeTagTmpService.querySuccessCount(enterpriseId);
JSONObject jsonObject = new JSONObject();
jsonObject.put("successCount", successCount);
return EnterpriseServiceResponse.success(jsonObject);
}
}
gic-store-service/src/main/resources/mapper/TabStoreExtendMapper.xml
......@@ -165,4 +165,7 @@
and store_extend_id &lt;&gt; #{storeExtendId}
</if>
</select>
<delete id="delete">
delete from tab_store_extend where enterprise_id = #{enterpriseId} and store_info_id = #{storeInfoId}
</delete>
</mapper>
\ No newline at end of file
gic-store-service/src/main/resources/mapper/TabStoreTagTmpMapper.xml
......@@ -136,4 +136,9 @@
where enterprise_id = #{enterpriseId}
and error_message is not null
</select>
<select id="querySuccessCount" resultType="int">
select
count(*)
from tab_store_tag_tmp where enterprise_id = #{enterpriseId} and error_message is null
</select>
</mapper>
\ No newline at end of file
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
......@@ -34,7 +34,6 @@ import com.gic.store.web.vo.StoreListSourceVO;
import com.gic.store.web.vo.StoreOverflowVO;
import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
import com.gic.wechat.business.api.service.wxa.WeixinWxaFunService;
import org.apache.catalina.User;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -43,11 +42,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
......@@ -139,7 +140,7 @@ public class StoreController extends DownloadUtils {
}
@RequestMapping("/store-list")
public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO, Integer storeTagId) {
public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO) {
logger.info("查询条件：{}", JSON.toJSONString(storeSearchDTO));
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
Integer userId = UserDetailUtils.getUserDetail().getUserId();
......@@ -149,9 +150,17 @@ public class StoreController extends DownloadUtils {
}
//门店标签
ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeTagId);
ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeSearchDTO.getStoreTagId());
if (storeTagResult.isSuccess()) {
storeSearchDTO.setStoreResource(Long.parseLong(storeTagResult.getResult().getStoreWidgetId().toString()));
StoreWidgetDTO storeWidgetDTO = this.storeWidgetApiService.getStoreWidget(Integer.valueOf(storeTagResult.getResult().getStoreWidgetId().toString())).getResult();
if(storeWidgetDTO != null){
String authSearchParam = storeWidgetDTO.getAuthSearchParam();
String searchParam = storeWidgetDTO.getSearchParam();
if(StringUtils.isNotBlank(authSearchParam) && !"{}".equals(authSearchParam)){
storeSearchDTO.setAuthSearchJson(authSearchParam);
}
storeSearchDTO.setSearchJson(searchParam);
}
}
String key = StoreRedisKeyUtils.getStoreListSourceKey(enterpriseId, userId);
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java
......@@ -388,7 +388,10 @@ public class StoreImportController {
// 验证品牌
String brands = row.get(7);
if (StringUtils.isNotBlank(brands)) {
if (StringUtils.isBlank(brands)) {
errorMessage.append("店招品牌不能为空,");
} else {
brands = brands.trim();
bean.setBrands(brands);
String errorMsg = brandsValidate(enterpriseId, brands);
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreTagController.java
package com.gic.store.web.controller;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
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.error.ErrorCode;
......@@ -12,6 +14,7 @@ import com.gic.store.dto.*;
import com.gic.store.service.*;
import com.gic.store.web.qo.PageQO;
import com.gic.store.web.utils.ExcelUtils;
import com.gic.store.web.vo.StoreTagErrorListVO;
import com.gic.store.web.vo.StoreTagVO;
import com.gic.store.web.vo.storeWidget.StoreWidgetSearch;
import com.gic.store.web.vo.storeWidget.StoreWidgetWriteBack;
......@@ -69,8 +72,8 @@ public class StoreTagController {
@RequestMapping("/edit-store-tag")
public RestResponse edit(StoreTagDTO dto, MultipartFile file, Integer dataType) {
Map<String, Object> map = parseFile(file, dto.getStoreWidgetId());
if (dataType != null && dataType == 2) {
Map<String, Object> map = parseFile(file, dto.getStoreWidgetId());
Object msg = map.get("msg");
if (msg != null) {
return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), msg.toString());
......@@ -162,7 +165,16 @@ public class StoreTagController {
@RequestMapping("/list-import-error")
public RestResponse listImportError(PageQO pageQO) {
ServiceResponse<Page<StoreTagTmpDTO>> serviceResponse = this.storeTagTmpApiService.listImportError(UserDetailUtils.getUserDetail().getEnterpriseId(), pageQO.getCurrentPage(), pageQO.getPageSize());
return ResultControllerUtils.commonResult(serviceResponse);
if (serviceResponse.isSuccess()) {
StoreTagErrorListVO vo = EntityUtil.changeEntityByJSON(StoreTagErrorListVO.class, serviceResponse.getResult());
ServiceResponse<JSONObject> countResponse = storeTagTmpApiService.queryCount(UserDetailUtils.getUserDetail().getEnterpriseId());
JSONObject result = countResponse.getResult();
vo.setSuccessCount(result.getInteger("successCount"));
return RestResponse.success(vo);
} else {
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
}
private Map<String, Object> parseFile(MultipartFile file, Integer storeWidgetId) {
......
gic-store-web/src/main/java/com/gic/store/web/utils/ExcelUtils.java
......@@ -297,9 +297,9 @@ public class ExcelUtils {
// XSSFWorkbook xssfWorkbook = new XSSFWorkbook(in);
for (int numSheet = 0; numSheet < 1; numSheet++) {
Sheet xssfSheet = xssfWorkbook.getSheetAt(numSheet);
if (xssfSheet == null || xssfSheet.getLastRowNum() == 1) {
continue;
}
// if (xssfSheet == null || xssfSheet.getLastRowNum() == 1) {
// continue;
// }
for (int rowNum = row - 1; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
Row xssfRow = xssfSheet.getRow(rowNum);
if (xssfRow == null) {
......
gic-store-web/src/main/java/com/gic/store/web/vo/StoreTagErrorListVO.java 0 → 100644
package com.gic.store.web.vo;
import com.gic.api.base.commons.Page;
/**
* @author zhiwj
* @Description:
* @date 2020-02-28 16:34
*/
public class StoreTagErrorListVO extends Page {
private static final long serialVersionUID = -7808725362785909785L;
private Integer successCount;
public Integer getSuccessCount() {
return successCount;
}
public void setSuccessCount(Integer successCount) {
this.successCount = successCount;
}
}
gic-store-web/src/main/java/com/gic/store/web/vo/storeWidget/StoreWidgetSearch.java
......@@ -18,7 +18,7 @@ public class StoreWidgetSearch {
List<StoreWidgetSearch> storeWidgetSearches = JSON.parseArray(json, StoreWidgetSearch.class);
StoreWidgetSearch storeWidgetSearch = storeWidgetSearches.get(0);
storeWidgetSearch.getList().get(0).getData().setValue(Joiner.on(" ").join(storeIdList));
return JSON.toJSONString(storeWidgetSearch);
return JSON.toJSONString(storeWidgetSearches);
}
/**
......
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