Skip to content

G
gic-store
Commit 43dadca6 by guojuxing
Options

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

parents a16c6a5c 2cd1f87a
Showing with 343 additions and 67 deletions
gic-store-api/src/main/java/com/gic/store/dto/StoreExtendDTO.java
......@@ -36,7 +36,7 @@ public class StoreExtendDTO implements Serializable {
/**
*
*/
private Integer sort;
private Double sort;
/**
* 属性名称
......@@ -104,11 +104,11 @@ public class StoreExtendDTO implements Serializable {
this.value = value;
}
public Integer getSort() {
public Double getSort() {
return sort;
}
public void setSort(Integer sort) {
public void setSort(Double sort) {
this.sort = sort;
}
......
gic-store-api/src/main/java/com/gic/store/dto/StoreTmpDTO.java
package com.gic.store.dto;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author zhiwj
......@@ -115,6 +117,9 @@ public class StoreTmpDTO implements Serializable {
private String storeGroupName;
private Date updateTime;
private List<StoreExtendDTO> extendList;
public Integer getStoreTmpId() {
return storeTmpId;
}
......@@ -290,4 +295,20 @@ public class StoreTmpDTO implements Serializable {
public void setStoreGroupName(String storeGroupName) {
this.storeGroupName = storeGroupName;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public void setExtendList(List<StoreExtendDTO> extendList) {
this.extendList = extendList;
}
public List<StoreExtendDTO> getExtendList() {
return extendList;
}
}
gic-store-api/src/main/java/com/gic/store/service/StoreImportApiService.java
......@@ -33,5 +33,9 @@ public interface StoreImportApiService {
ServiceResponse<List<String>> listBrandByNotExist(Integer enterpriseId, String brands);
ServiceResponse<List<StoreTmpDTO>> listStoreTmp(Integer enterpriseId, Boolean isRight);
ServiceResponse<List<StoreTmpDTO>> listAllStoreTmp(Integer enterpriseId);
// List<StoreTmpDTO> listStoreTmp(Integer enterpriseId, Boolean isSuccess, Boolean isWait);
}
gic-store-service/src/main/java/com/gic/store/entity/TabStoreExtend.java
......@@ -34,7 +34,7 @@ public class TabStoreExtend {
/**
*
*/
private Integer sort;
private Double sort;
/**
*
......@@ -91,11 +91,11 @@ public class TabStoreExtend {
this.value = value;
}
public Integer getSort() {
public Double getSort() {
return sort;
}
public void setSort(Integer sort) {
public void setSort(Double sort) {
this.sort = sort;
}
......
gic-store-service/src/main/java/com/gic/store/service/StoreImportService.java
......@@ -17,10 +17,13 @@ public interface StoreImportService {
void save(StoreTmpDTO bean);
Page listStoreTmp(Integer enterpriseId, boolean isSuccess, Integer currentPage, Integer pageSize);
Page<TabStoreTmp> listStoreTmp(Integer enterpriseId, boolean isSuccess, Integer currentPage, Integer pageSize);
List<TabStoreTmp> listUnImportStore(String enterpriseId);
void updateData(StoreTmpDTO t);
List<TabStoreTmp> listStoreTmp(Integer enterpriseId, Boolean isSuccess);
List<TabStoreTmp> listAllStoreTmp(Integer enterpriseId);
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreExtendServiceImpl.java
......@@ -7,9 +7,11 @@ import com.gic.store.entity.TabStoreExtend;
import com.gic.store.entity.TabStoreField;
import com.gic.store.service.StoreExtendService;
import com.gic.store.service.StoreFieldService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.Date;
import java.util.List;
......@@ -28,15 +30,17 @@ public class StoreExtendServiceImpl implements StoreExtendService {
@Override
public void saveOrUpdate(Integer enterpriseId, Integer storeId, List<StoreExtendDTO> storeExtendList) {
List<TabStoreExtend> tabStoreExtendList = EntityUtil.changeEntityListByOrika(TabStoreExtend.class, storeExtendList);
for (TabStoreExtend tabStoreExtend : tabStoreExtendList) {
tabStoreExtend.setEnterpriseId(enterpriseId);
tabStoreExtend.setStoreId(storeId);
if (tabStoreExtend.getStoreExtendId() == null) {
tabStoreExtend.setCreateTime(new Date());
tabStoreExtendMapper.insertSelective(tabStoreExtend);
} else {
tabStoreExtendMapper.updateByPrimaryKeySelective(tabStoreExtend);
if (CollectionUtils.isNotEmpty(storeExtendList)) {
List<TabStoreExtend> tabStoreExtendList = EntityUtil.changeEntityListByOrika(TabStoreExtend.class, storeExtendList);
for (TabStoreExtend tabStoreExtend : tabStoreExtendList) {
tabStoreExtend.setEnterpriseId(enterpriseId);
tabStoreExtend.setStoreId(storeId);
if (tabStoreExtend.getStoreExtendId() == null) {
tabStoreExtend.setCreateTime(new Date());
tabStoreExtendMapper.insertSelective(tabStoreExtend);
} else {
tabStoreExtendMapper.updateByPrimaryKeySelective(tabStoreExtend);
}
}
}
}
......@@ -48,15 +52,19 @@ public class StoreExtendServiceImpl implements StoreExtendService {
@Override
public List<StoreExtendDTO> convertStoreExtendToDTO(List<TabStoreExtend> extendList) {
List<StoreExtendDTO> extendDTOList = EntityUtil.changeEntityListByOrika(StoreExtendDTO.class, extendList);
for (StoreExtendDTO storeExtendDTO : extendDTOList) {
TabStoreField field = storeFieldService.getStoreFieldById(storeExtendDTO.getStoreFieldId());
storeExtendDTO.setStoreFieldName(field.getStoreFieldName());
storeExtendDTO.setStoreFieldCode(field.getStoreFieldCode());
storeExtendDTO.setStoreFieldType(field.getStoreFieldType());
storeExtendDTO.setStoreFieldDetail(field.getStoreFieldDetail());
storeExtendDTO.setErpRelCode(field.getErpRelCode());
if (CollectionUtils.isNotEmpty(extendList)) {
List<StoreExtendDTO> extendDTOList = EntityUtil.changeEntityListByOrika(StoreExtendDTO.class, extendList);
for (StoreExtendDTO storeExtendDTO : extendDTOList) {
TabStoreField field = storeFieldService.getStoreFieldById(storeExtendDTO.getStoreFieldId());
storeExtendDTO.setStoreFieldName(field.getStoreFieldName());
storeExtendDTO.setStoreFieldCode(field.getStoreFieldCode());
storeExtendDTO.setStoreFieldType(field.getStoreFieldType());
storeExtendDTO.setStoreFieldDetail(field.getStoreFieldDetail());
storeExtendDTO.setErpRelCode(field.getErpRelCode());
}
return extendDTOList;
} else {
return Collections.emptyList();
}
return extendDTOList;
}
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreImportServiceImpl.java
......@@ -41,9 +41,9 @@ public class StoreImportServiceImpl implements StoreImportService {
}
@Override
public Page listStoreTmp(Integer enterpriseId, boolean isSuccess, Integer currentPage, Integer pageSize) {
public Page<TabStoreTmp> listStoreTmp(Integer enterpriseId, boolean isSuccess, Integer currentPage, Integer pageSize) {
PageHelper.startPage(currentPage, pageSize);
return (Page) tabStoreTmpMapper.listStoreTmp(enterpriseId, isSuccess);
return (Page<TabStoreTmp>) tabStoreTmpMapper.listStoreTmp(enterpriseId, isSuccess);
}
@Override
......@@ -59,6 +59,16 @@ public class StoreImportServiceImpl implements StoreImportService {
tabStoreTmpMapper.updateByPrimaryKeySelective(tabStoreTmp);
}
@Override
public List<TabStoreTmp> listStoreTmp(Integer enterpriseId, Boolean isSuccess) {
return tabStoreTmpMapper.listStoreTmp(enterpriseId, isSuccess);
}
@Override
public List<TabStoreTmp> listAllStoreTmp(Integer enterpriseId) {
return tabStoreTmpMapper.listStoreTmp(enterpriseId, null);
}
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreTaskServiceImpl.java
package com.gic.store.service.impl;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.GlobalInfo;
import com.gic.store.constant.Constants;
......@@ -157,7 +158,9 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
storeDTO.setCreateType(CreateTypeEnum.BATCH_IMPORT.getCode());
// todo 扩展信息
// storeDTO.setStoreExtendList(c);
String customField = t.getCustomField();
List<StoreExtendDTO> extendList = JSON.parseArray(customField, StoreExtendDTO.class);
storeDTO.setStoreExtendList(extendList);
return storeApiService.saveOrUpdate(storeDTO);
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/StoreImportApiServiceImpl.java
package com.gic.store.service.outer;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.store.dto.StoreExtendDTO;
import com.gic.store.dto.StoreTmpDTO;
import com.gic.store.entity.TabStoreBrand;
import com.gic.store.entity.TabStoreExtend;
import com.gic.store.entity.TabStoreGroup;
import com.gic.store.service.*;
import com.gic.store.utils.ErrorCode;
......@@ -45,6 +49,9 @@ public class StoreImportApiServiceImpl implements StoreImportApiService {
@Autowired
private StoreTaskService storeTaskService;
@Autowired
private StoreExtendService storeExtendService;
@Override
public ServiceResponse<Boolean> hasImportingStore(Integer enterpriseId) {
return ServiceResponse.success(storeImportService.hasImportingStore(enterpriseId));
......@@ -64,6 +71,12 @@ public class StoreImportApiServiceImpl implements StoreImportApiService {
public ServiceResponse<Page> listStoreTmp(Integer enterpriseId, boolean isSuccess, Integer currentPage, Integer pageSize) {
com.github.pagehelper.Page storeTmpList = storeImportService.listStoreTmp(enterpriseId, isSuccess, currentPage, pageSize);
Page<StoreTmpDTO> page = PageHelperUtils.changePageHelperToCurrentPage(storeTmpList, StoreTmpDTO.class);
List<StoreTmpDTO> result = page.getResult();
for (StoreTmpDTO storeTmpDTO : result) {
String customField = storeTmpDTO.getCustomField();
List<StoreExtendDTO> extendList = storeExtendService.convertStoreExtendToDTO(JSON.parseArray(customField, TabStoreExtend.class));
storeTmpDTO.setExtendList(extendList);
}
return ServiceResponse.success(page);
}
......@@ -101,6 +114,17 @@ public class StoreImportApiServiceImpl implements StoreImportApiService {
}
@Override
public ServiceResponse<List<StoreTmpDTO>> listStoreTmp(Integer enterpriseId, Boolean isRight) {
return ServiceResponse.success(EntityUtil.changeEntityListByOrika(StoreTmpDTO.class, storeImportService.listStoreTmp(enterpriseId, isRight)));
}
@Override
public ServiceResponse<List<StoreTmpDTO>> listAllStoreTmp(Integer enterpriseId) {
return ServiceResponse.success(EntityUtil.changeEntityListByOrika(StoreTmpDTO.class, storeImportService.listAllStoreTmp(enterpriseId)));
}
@Override
public ServiceResponse<String> importDataToStore(Integer enterpriseId, String userId, String uuId) {
try {
return ServiceResponse.success(storeTaskService.importDataToStore(enterpriseId, userId, uuId));
......
gic-store-service/src/main/resources/mapper/TabStoreExtendMapper.xml
......@@ -7,7 +7,7 @@
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="store_field_id" jdbcType="INTEGER" property="storeFieldId" />
<result column="value" jdbcType="VARCHAR" property="value" />
<result column="sort" jdbcType="INTEGER" property="sort" />
<result column="sort" jdbcType="DOUBLE" property="sort" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="is_search" jdbcType="INTEGER" property="isSearch" />
......@@ -32,7 +32,7 @@
create_time, update_time, is_search
)
values (#{storeExtendId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{storeFieldId,jdbcType=INTEGER}, #{value,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER},
#{storeFieldId,jdbcType=INTEGER}, #{value,jdbcType=VARCHAR}, #{sort,jdbcType=DOUBLE},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isSearch,jdbcType=INTEGER}
)
</insert>
......@@ -84,7 +84,7 @@
#{value,jdbcType=VARCHAR},
</if>
<if test="sort != null">
#{sort,jdbcType=INTEGER},
#{sort,jdbcType=DOUBLE},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
......@@ -113,7 +113,7 @@
value = #{value,jdbcType=VARCHAR},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=INTEGER},
sort = #{sort,jdbcType=DOUBLE},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
......@@ -133,7 +133,7 @@
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
store_field_id = #{storeFieldId,jdbcType=INTEGER},
value = #{value,jdbcType=VARCHAR},
sort = #{sort,jdbcType=INTEGER},
sort = #{sort,jdbcType=DOUBLE},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
is_search = #{isSearch,jdbcType=INTEGER}
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreBrandController.java
......@@ -2,11 +2,13 @@ package com.gic.store.web.controller;
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.store.dto.StoreBrandDTO;
import com.gic.store.service.StoreBrandApiService;
import com.gic.store.utils.ErrorCode;
import com.gic.store.web.qo.PageQO;
import com.gic.store.web.qo.storeBrand.StoreBrandQO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -25,19 +27,20 @@ public class StoreBrandController {
private StoreBrandApiService storeBrandApiService;
@RequestMapping("/save-store-brand")
public RestResponse saveStoreBrand(StoreBrandDTO storeBrandDTO) {
public RestResponse saveStoreBrand(StoreBrandQO storeBrandQO) {
Integer enterpriseId = 1111;
if (StringUtils.isBlank(storeBrandDTO.getStoreBrandCode()) ||
StringUtils.isBlank(storeBrandDTO.getStoreBrandName()) ||
StringUtils.isBlank(storeBrandDTO.getStoreBrandCategory()) ||
storeBrandDTO.getStoreSupport() == null ||
storeBrandDTO.getGoodsSupport() == null
if (StringUtils.isBlank(storeBrandQO.getStoreBrandCode()) ||
StringUtils.isBlank(storeBrandQO.getStoreBrandName()) ||
StringUtils.isBlank(storeBrandQO.getStoreBrandCategory()) ||
storeBrandQO.getStoreSupport() == null ||
storeBrandQO.getGoodsSupport() == null
) {
return RestResponse.failure(ErrorCode.ERR_5.getCode(), ErrorCode.ERR_5.getMsg());
}
if (storeBrandDTO.getStoreSupport() == 0 && storeBrandDTO.getGoodsSupport() == 0) {
if (storeBrandQO.getStoreSupport() == 0 && storeBrandQO.getGoodsSupport() == 0) {
return RestResponse.failure(ErrorCode.ERR_5.getCode(), "门店适用或商品使用至少要选一个");
}
StoreBrandDTO storeBrandDTO = EntityUtil.changeEntity(StoreBrandDTO.class, storeBrandQO);
storeBrandDTO.setEnterpriseId(enterpriseId);
ServiceResponse<Integer> serviceResponse = storeBrandApiService.saveOrUpdateStoreBrand(storeBrandDTO);
if (serviceResponse.isSuccess()) {
......@@ -102,5 +105,4 @@ public class StoreBrandController {
}
}
}
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
......@@ -4,37 +4,25 @@ import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.store.constant.CreateTypeEnum;
import com.gic.store.dto.StoreBusinessTimeDTO;
import com.gic.store.dto.StoreDTO;
import com.gic.store.dto.StoreExtendDTO;
import com.gic.store.dto.StorePhotoDTO;
import com.gic.store.dto.*;
import com.gic.store.service.StoreApiService;
import com.gic.store.utils.ErrorCode;
import com.gic.store.web.ExcelUtils;
import com.gic.store.web.qo.PageQO;
import com.gic.store.web.qo.store.StoreQO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author zhiwj
......@@ -64,7 +52,7 @@ public class StoreController {
storeDTO.setBusinessTimeList(businessTimeList);
}
storeDTO.setCreateType(CreateTypeEnum.BACKGROUND_ADD.getCode());
String fieldJson = storeQO.getFieldJson();
String fieldJson = storeQO.getStoreExtends();
List<StoreExtendDTO> extendList = JSON.parseArray(fieldJson, StoreExtendDTO.class);
storeDTO.setStoreExtendList(extendList);
ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java
package com.gic.store.web.controller;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
......@@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.*;
/**
......@@ -52,6 +54,9 @@ public class StoreImportController {
@Autowired
private ProvincesApiService provincesApiService;
@Autowired
private StoreFieldApiService storeFieldApiService;
@RequestMapping("/store-import-template-download")
public Object download(HttpServletRequest request, HttpServletResponse response) throws Exception {
// ClassPathResource res = new ClassPathResource("门店资料导入模板.xlsx");
......@@ -127,7 +132,7 @@ public class StoreImportController {
// }
storeImportApiService.delStoreTmp(enterpriseId);
for (Map<Integer, String> row : data) {
StoreTmpDTO bean = this.validateData(row, enterpriseId);
StoreTmpDTO bean = this.validateData(row, enterpriseId, storeRegion.getRegionId());
bean.setRegionId(storeRegion.getRegionId());
bean.setRegionName(storeRegion.getRegionName());
try {
......@@ -144,7 +149,8 @@ public class StoreImportController {
// TODO userId
String r = storeImportApiService.importDataToStore(enterpriseId, "123", uuId).getResult();
if (StringUtils.isNotBlank(r)) {
return RestResponse.failure(ErrorCode.ERR_5.getCode(), "excel验证不通过");
logger.warn("队列错误, {}", r);
return RestResponse.failure(ErrorCode.ERR_5.getCode(), "网络错误");
}
} else {
Page page = storeImportApiService.listStoreTmp(enterpriseId, false, pageQO.getCurrentPage(), pageQO.getPageSize()).getResult();
......@@ -171,7 +177,36 @@ public class StoreImportController {
return RestResponse.success();
}
private StoreTmpDTO validateData(Map<Integer, String> row, Integer enterpriseId) {
@RequestMapping("/store-import-load-error-data")
public Object loadErrorData(PageQO page) {
Integer enterpriseId = 1111;
Map<String, Object> result = new HashMap<String, Object>();
List<StoreTmpDTO> successList = storeImportApiService.listStoreTmp(enterpriseId, true).getResult();
ServiceResponse<Page> serviceResponse = storeImportApiService.listStoreTmp(enterpriseId, false, page.getCurrentPage(), page.getPageSize());
List<StoreTmpDTO> totalList = storeImportApiService.listAllStoreTmp(enterpriseId).getResult();
Page pageResponse = serviceResponse.getResult();
result.put("errorData", pageResponse);
result.put("total", totalList == null ? 0 : totalList.size());
result.put("success", successList == null ? 0 : successList.size());
result.put("error", pageResponse.getResult().size());
return RestResponse.success(result);
}
@RequestMapping("export-error-data")
public void exportErrorData(HttpServletRequest request, HttpServletResponse response) throws IOException {
Integer enterpriseId = 1111;
String fileName = "门店导入错误记录.xlsx";
List<StoreTmpDTO> listErrorData = storeImportApiService.listStoreTmp(enterpriseId, false).getResult();
if (!listErrorData.isEmpty()) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmm");
fileName = sdf.format(listErrorData.get(0).getUpdateTime()) + fileName;
} else {
return;
}
// todo
}
private StoreTmpDTO validateData(Map<Integer, String> row, Integer enterpriseId, Integer regionId) {
boolean validate = true;
StoreTmpDTO bean = new StoreTmpDTO();
bean.setEnterpriseId(enterpriseId);
......@@ -344,6 +379,19 @@ public class StoreImportController {
bean.setLongitude(row.get(12));
bean.setLatitude(row.get(13));
// 自定义属性
//todo 自定义属性验证
ServiceResponse<List<StoreFieldDTO>> fieldServiceResponse = storeFieldApiService.listStoreFieldByRegionId(regionId);
List<StoreFieldDTO> fieldList = fieldServiceResponse.getResult();
List<StoreExtendDTO> extendDTOList = new ArrayList<>();
for (int i = 0; i < fieldList.size(); i++) {
StoreExtendDTO storeExtendDTO = new StoreExtendDTO();
storeExtendDTO.setStoreFieldId(fieldList.get(i).getStoreFieldId());
storeExtendDTO.setValue(row.get(14 + i));
storeExtendDTO.setSort(fieldList.get(i).getSort());
extendDTOList.add(storeExtendDTO);
}
bean.setCustomField(JSON.toJSONString(extendDTOList));
return bean;
}
......
gic-store-web/src/main/java/com/gic/store/web/qo/store/StoreQO.java
......@@ -110,7 +110,7 @@ public class StoreQO implements Serializable {
private String delBusinessTimes;
private String businessTimes;
private String storeGroupName;
private String fieldJson;
private String storeExtends;
public Integer getStoreId() {
return storeId;
......@@ -328,11 +328,11 @@ public class StoreQO implements Serializable {
this.createType = createType;
}
public String getFieldJson() {
return fieldJson;
public String getStoreExtends() {
return storeExtends;
}
public void setFieldJson(String fieldJson) {
this.fieldJson = fieldJson;
public void setStoreExtends(String storeExtends) {
this.storeExtends = storeExtends;
}
}
gic-store-web/src/main/java/com/gic/store/web/qo/storeBrand/StoreBrandQO.java 0 → 100644
package com.gic.store.web.qo.storeBrand;
import java.io.Serializable;
import java.util.Date;
/**
* @author zhiwj
* @date 2019/7/5
*/
public class StoreBrandQO implements Serializable {
private static final long serialVersionUID = -6444690001235296650L;
/**
*
*/
private Integer storeBrandId;
/**
* 品牌code
*/
private String storeBrandCode;
/**
* 品牌名称
*/
private String storeBrandName;
/**
* 经营类目
*/
private String storeBrandCategory;
/**
* 门店适用 1:适用 0:不适用
*/
private Integer storeSupport;
/**
* 商品适用 1:适用 0:不适用
*/
private Integer goodsSupport;
/**
* 排序字段
*/
private Double sort;
/**
*
*/
private Integer enterpriseId;
/**
*
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
private Integer seq;
public Integer getStoreBrandId() {
return storeBrandId;
}
public void setStoreBrandId(Integer storeBrandId) {
this.storeBrandId = storeBrandId;
}
public String getStoreBrandCode() {
return storeBrandCode;
}
public void setStoreBrandCode(String storeBrandCode) {
this.storeBrandCode = storeBrandCode;
}
public String getStoreBrandName() {
return storeBrandName;
}
public void setStoreBrandName(String storeBrandName) {
this.storeBrandName = storeBrandName;
}
public String getStoreBrandCategory() {
return storeBrandCategory;
}
public void setStoreBrandCategory(String storeBrandCategory) {
this.storeBrandCategory = storeBrandCategory;
}
public Integer getStoreSupport() {
return storeSupport;
}
public void setStoreSupport(Integer storeSupport) {
this.storeSupport = storeSupport;
}
public Integer getGoodsSupport() {
return goodsSupport;
}
public void setGoodsSupport(Integer goodsSupport) {
this.goodsSupport = goodsSupport;
}
public Double getSort() {
return sort;
}
public void setSort(Double sort) {
this.sort = sort;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getSeq() {
return seq;
}
public void setSeq(Integer seq) {
this.seq = seq;
}
}
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