Merge branch 'developer' into 'master'

Developer

See merge request !9

pom.xml

@@ -167,6 +167,11 @@
             <artifactId>gic-mall-api </artifactId>
             <version>${gic-mall-api} </version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sanselan</groupId>
+            <artifactId>sanselan</artifactId>
+            <version>0.97-incubator</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/gic/plug/web/controller/ProvincesController.java

@@ -2,6 +2,7 @@ package com.gic.plug.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.ano.IgnoreLogin;
@@ -23,7 +24,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 省
+ * @ClassName: ProvincesController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:55 AM

+ */
 @Controller
 public class ProvincesController {
     @Autowired
@@ -32,15 +39,16 @@ public class ProvincesController {
     @RequestMapping("dict-district-list")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object provinces(String id, @RequestParam(defaultValue = "1")int type){
         switch (type){
             case 1:
                 ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.selectAllProvince();
                 return RestResponse.success(EntityUtil.changeEntityListByJSON(ProvinceVO.class, serviceResponse.getResult()));
             case 2:
-                ServiceResponse<List<CityDTO>> serviceResponse1 = this.provincesApiService.selectAllCity();
-                if(serviceResponse1.isSuccess()){
-                    List<CityDTO> list = serviceResponse1.getResult();
+                ServiceResponse<List<CityDTO>> cityResponse = this.provincesApiService.selectAllCity();
+                if(cityResponse.isSuccess()){
+                    List<CityDTO> list = cityResponse.getResult();
                     List<CityVO> resultList = new ArrayList<>();
                     for(CityDTO cityDTO : list){
                         if(cityDTO.getProvinceId().equals(id)){
@@ -50,9 +58,9 @@ public class ProvincesController {
                     return RestResponse.success(resultList);
                 }
             case 3:
-                ServiceResponse<List<CountyDTO>> serviceResponse2 = this.provincesApiService.selectAllCounty();
-                if(serviceResponse2.isSuccess()){
-                    List<CountyDTO> list = serviceResponse2.getResult();
+                ServiceResponse<List<CountyDTO>> countyResponse = this.provincesApiService.selectAllCounty();
+                if(countyResponse.isSuccess()){
+                    List<CountyDTO> list = countyResponse.getResult();
                     List<CountyDTO> resultList = new ArrayList<>();
                     for(CountyDTO countyDTO : list){
                         if(countyDTO.getCityId().equals(id)){
@@ -61,6 +69,7 @@ public class ProvincesController {
                     }
                     return RestResponse.success(resultList);
                 }
+            default:
         }
         return RestResponse.success();
     }
@@ -68,6 +77,7 @@ public class ProvincesController {
     @RequestMapping("query-provinces")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object searchProvinces(String search){
         ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.queryProvinces(search);
         if(serviceResponse.isSuccess()){
@@ -79,6 +89,7 @@ public class ProvincesController {
     @RequestMapping("query-city")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object searchCitys(String search){
         if(StringUtils.isBlank(search)){
             return RestResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getMsg());
@@ -93,6 +104,7 @@ public class ProvincesController {
     @RequestMapping("query-county")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object searchCounty(String search){
         if(StringUtils.isBlank(search)){
             return RestResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getMsg());
@@ -107,14 +119,15 @@ public class ProvincesController {
     @RequestMapping("query-district")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse queryDistrictByIds(String ids){
         if(StringUtils.isBlank(ids)){
             return RestResponse.success();
         }
         List<String> result = new ArrayList<>();
         ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.selectAllProvince();
-        ServiceResponse<List<CityDTO>> serviceResponse1 = this.provincesApiService.selectAllCity();
-        ServiceResponse<List<CountyDTO>> serviceResponse2 = this.provincesApiService.selectAllCounty();
+        ServiceResponse<List<CityDTO>> cityResponse = this.provincesApiService.selectAllCity();
+        ServiceResponse<List<CountyDTO>> countyResponse = this.provincesApiService.selectAllCounty();
         String[] idArr = ids.split(",");
         for(String id : idArr){
             if(serviceResponse.isSuccess()){
@@ -126,8 +139,8 @@ public class ProvincesController {
                     }
                 }
             }
-            if(serviceResponse1.isSuccess()){
-                List<CityDTO> cityDTOList = serviceResponse1.getResult();
+            if(cityResponse.isSuccess()){
+                List<CityDTO> cityDTOList = cityResponse.getResult();
                 for(CityDTO cityDTO : cityDTOList){
                     if(id.equals(cityDTO.getCityId())){
                         result.add(cityDTO.getCityName());
@@ -135,8 +148,8 @@ public class ProvincesController {
                     }
                 }
             }
-            if(serviceResponse2.isSuccess()){
-                List<CountyDTO> countyDTOList = serviceResponse2.getResult();
+            if(countyResponse.isSuccess()){
+                List<CountyDTO> countyDTOList = countyResponse.getResult();
                 for(CountyDTO countyDTO : countyDTOList){
                     if(id.equals(countyDTO.getCountyId())){
                         result.add(countyDTO.getCountyName());
@@ -151,9 +164,10 @@ public class ProvincesController {
     @RequestMapping("dict-provinces-citys")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse listProvincesCitys(){
         ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.selectAllProvince();
-        ServiceResponse<List<CityDTO>> serviceResponse1 = this.provincesApiService.selectAllCity();
+        ServiceResponse<List<CityDTO>> citResponse = this.provincesApiService.selectAllCity();
         List<JSONObject> result = new ArrayList<>();
         if(serviceResponse.isSuccess()){
             List<ProvinceDTO> list = serviceResponse.getResult();
@@ -162,8 +176,8 @@ public class ProvincesController {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("provinceId", provinceDTO.getProvinceId());
                     jsonObject.put("provinceName", provinceDTO.getProvinceName());
-                    if(serviceResponse1.isSuccess()){
-                        List<CityDTO> cityDTOList = serviceResponse1.getResult();
+                    if(citResponse.isSuccess()){
+                        List<CityDTO> cityDTOList = citResponse.getResult();
                         if(CollectionUtils.isNotEmpty(cityDTOList)){
                             List<JSONObject> jsonObjectList = new ArrayList<>();
                             for(CityDTO cityDTO : cityDTOList){

src/main/java/com/gic/plug/web/controller/ScreeningController.java

@@ -24,12 +24,16 @@ import java.util.List;
 
 
 /**
- *
+ * 门店表情
+ * @ClassName: ScreeningController

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:36 AM

  */
 @Controller
 public class ScreeningController {
 
-    private Logger LOGGER = LogManager.getLogger(ScreeningController.class);
+    private static final Logger LOGGER = LogManager.getLogger(ScreeningController.class);
 
     @Autowired
     private EsScreeningInitService esScreeningInitService;
@@ -67,7 +71,8 @@ public class ScreeningController {
         }
         if (Constant.ERP_GOODS_SCREEN.equals(sceneCode) || Constant.WEIMOB_GOODS_SCREEN.equals(sceneCode) || Constant.CHANNEL_CODE_MALL.equals(sceneCode)) {
             //TODO
-            if ("1129".equals(enterpriseId)) {
+            String testEnterpriseId = "1129";
+            if (testEnterpriseId.equals(enterpriseId)) {
                 enterpriseId = "goods-test-1129";
             }
         }

src/main/java/com/gic/plug/web/controller/StoreController.java

@@ -110,7 +110,7 @@ public class StoreController {
         storeSearchDTO.setEnterpriseId(enterpriseId);
         storeSearchDTO.setSearchJson(storeWidgetCountQO.getSearchJson());
         storeSearchDTO.setAuthSearchJson(storeWidgetCountQO.getAuthSearchJson());
-        ServiceResponse<Long> response = storeApiService.queryStoreCountFromES(storeSearchDTO);
+        ServiceResponse<Long> response = storeApiService.queryStoreCountFromEs(storeSearchDTO);
         return RestResponse.success(response.getResult());
     }
 

src/main/java/com/gic/plug/web/controller/UploadImgController.java

 package com.gic.plug.web.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.ano.IgnoreLogin;
+import com.gic.enterprise.error.ErrorCode;
 import com.gic.thirdparty.BucketNameEnum;
 import com.gic.thirdparty.FileOperateUtils;
-import com.gic.thirdparty.pic.QQCloudPicUtils;
+import com.gic.thirdparty.pic.QqCloudPicUtils;
 import com.gic.thirdparty.pic.UploadResult;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.sanselan.ImageInfo;
+import org.apache.sanselan.ImageReadException;
+import org.apache.sanselan.Sanselan;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -19,13 +24,20 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
-
+/**
+ * 上传
+ * @ClassName: UploadImgController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:55 AM

+ */
 @RestController
 public class UploadImgController {
     private static Logger logger = LogManager.getLogger(UploadImgController.class);
 
     @RequestMapping("upload-images")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse uploadImages(HttpServletRequest request) throws IOException {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
         Iterator<String> iter = multiRequest.getFileNames();
@@ -36,9 +48,18 @@ public class UploadImgController {
             Map<String, Object> map = null;
             for (int i = 0; i < list.size(); i++) {
                 MultipartFile mf = list.get(i);
-                UploadResult uploadResult = QQCloudPicUtils.uploadLocalPicStream("pic01", "", mf.getBytes());
+                ImageInfo imageInfo = null;
+                try {
+                    imageInfo = Sanselan.getImageInfo(mf.getBytes());
+                } catch (ImageReadException e) {
+                    logger.warn("图片解析异常", e);
+                }
+                if(imageInfo.getColorType() == ImageInfo.COLOR_TYPE_CMYK){
+                    return RestResponse.failure(ErrorCode.NOT_SUPPORT.getCode(), "图片不支持上传CMYK色彩模式，请上传RGB色彩模式的图片");
+                }
+                UploadResult uploadResult = QqCloudPicUtils.uploadLocalPicStream("pic01", "", mf.getBytes());
                 logger.info("上传图片结果："+JSON.toJSONString(uploadResult));
-                Map<String, Object> pic = new HashMap<>();
+                Map<String, Object> pic = new HashMap<>(8);
                 pic.put("fileId", uploadResult.getFileId());
                 pic.put("url", uploadResult.getUrl());
                 pic.put("downloadUrl", uploadResult.getDownloadUrl());
@@ -50,8 +71,9 @@ public class UploadImgController {
 
     @RequestMapping("get-cos-secret")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse getCosSecret(HttpServletRequest request) throws IOException {
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>(8);
         map.put("secretId", "AKIDxpbnsmZ0KYtAKNd5f7QbbP3YyDJD6Rq3");
         map.put("secretKey", "GLFwRjpmYviRzLUREqKcieS4VmsmU1Lc");
         byte[] bytes = map.get("secretKey").getBytes();
@@ -65,6 +87,7 @@ public class UploadImgController {
 
     @RequestMapping("upload-file")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse uploadFile(HttpServletRequest request) throws IOException {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
         Iterator<String> iter = multiRequest.getFileNames();
@@ -74,7 +97,7 @@ public class UploadImgController {
             List<MultipartFile> list = multiRequest.getMultiFileMap().get(fileName);
             for (int i = 0; i < list.size(); i++) {
                 MultipartFile mf = list.get(i);
-                SimpleDateFormat sdf = new SimpleDateFormat("YYYYMMddHHmmss");
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
                 //获得原始文件名;
                 String fileRealName = mf.getOriginalFilename();
                 //点号的位置
@@ -121,7 +144,7 @@ public class UploadImgController {
 
     public static File multipartFileToFile(MultipartFile file) throws Exception {
         File toFile = null;
-        if (file.equals("") || file.getSize() <= 0) {
+        if ("".equals(file) || file.getSize() <= 0) {
             file = null;
         } else {
             InputStream ins = null;
@@ -140,10 +163,11 @@ public class UploadImgController {
      */
     private static void inputStreamToFile(InputStream ins, File file) {
         try {
+            int bufferSize = 8192;
             OutputStream os = new FileOutputStream(file);
             int bytesRead = 0;
-            byte[] buffer = new byte[8192];
-            while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) {
+            byte[] buffer = new byte[bufferSize];
+            while ((bytesRead = ins.read(buffer, 0, bufferSize)) != -1) {
                 os.write(buffer, 0, bytesRead);
             }
             os.close();

src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java

@@ -39,6 +39,10 @@ import java.util.stream.Collectors;
 
 /**
  * 商城装修选择器
+ * @ClassName: AppletConfigGoodsController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:58 AM

  */
 @RestController
 public class AppletConfigGoodsController extends BaseGoodsController {
@@ -74,11 +78,11 @@ public class AppletConfigGoodsController extends BaseGoodsController {
             if (appServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
             }
-            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), 1);
-            if (shopDTOServiceResponse.getResult() == null) {
+            ServiceResponse<ShopDTO> shopDtoServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), 1);
+            if (shopDtoServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
             }
-            shopId = shopDTOServiceResponse.getResult().getId();
+            shopId = shopDtoServiceResponse.getResult().getId();
         }
         ServiceResponse<List<MallGoodsCordDTO>> listServiceResponse = mallCordApiService.listSpecCordDTO(shopId, getEnterpriseId());
         return RestResponse
@@ -105,16 +109,16 @@ public class AppletConfigGoodsController extends BaseGoodsController {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "小程序不存在");
             }
             Integer shopType = 1;
-            ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), shopType);
-            if (shopDTOServiceResponse.getResult() == null) {
+            ServiceResponse<ShopDTO> shopDtoServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), shopType);
+            if (shopDtoServiceResponse.getResult() == null) {
                 return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
             }
-            shopId = shopDTOServiceResponse.getResult().getId();
+            shopId = shopDtoServiceResponse.getResult().getId();
         }
         if (shopId == null) {
             return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "不存在店铺");
         }
-        JSONObject cordJSON = null;
+        JSONObject cordJson = null;
         if (cordId != null) {
             ServiceResponse<List<GoodsCordDTO>> serviceResponse = cordApiService.listChildAll(cordId, getEnterpriseId());
             List<Long> cordList = new ArrayList<>();
@@ -122,11 +126,11 @@ public class AppletConfigGoodsController extends BaseGoodsController {
                 cordList.add(goodsCord.getSpecCordId());
             }
             cordList.add(cordId);
-            cordJSON = QueryConditionAssemblyUtil.createSimpleQueryNode("cordId",
+            cordJson = QueryConditionAssemblyUtil.createSimpleQueryNode("cordId",
                     OperateEnum.OPERATE_CONTAIN, Joiner.on(" ").join(cordList));
         }
         ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchGoods(currentPage, pageSize, null, shopId, search,
-                Constant.CHANNEL_CODE_MALL, cordJSON, 1);
+                Constant.CHANNEL_CODE_MALL, cordJson, 1);
         if (serviceResponse.isSuccess()) {
             List<Long> goodsIds = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(serviceResponse.getResult().getRes())) {
@@ -211,31 +215,45 @@ public class AppletConfigGoodsController extends BaseGoodsController {
             log.info("查不到小程序信息 appConfigId={}", appConfigId);
         }
         Integer shopType = 2;
-        ServiceResponse<ShopDTO> shopDTOServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), shopType);
-        if (shopDTOServiceResponse.getResult() == null) {
+        ServiceResponse<ShopDTO> shopDtoServiceResponse = shopApiService.getShopByAppletId(appServiceResponse.getResult().getAppletConfigId(), getEnterpriseId(), shopType);
+        if (shopDtoServiceResponse.getResult() == null) {
 
             log.info("查不到店铺信息 appConfigId={}", appConfigId);
             return null;
         }
-        goodsDomainId = shopDTOServiceResponse.getResult().getAreaId();
+        goodsDomainId = shopDtoServiceResponse.getResult().getAreaId();
         return goodsDomainId;
 
     }
 
-    //type 1商城本体 2商品资料
+    /**
+     * type 1商城本体 2商品资料
+     * @param currentPage
+     * @param pageSize
+     * @param goodsDomainId
+     * @param shopId
+     * @param search
+     * @param channelCode
+     * @param queryObject
+     * @param type
+     * @return
+     */
     private ServiceResponse<ESResponseQueryBatchDTO> searchGoods(Integer currentPage, Integer pageSize,
                                                                  Long goodsDomainId, Long shopId, String search, String channelCode,
                                                                  JSONObject queryObject, int type) {
         DynamicSearchDTO searchDTO = new DynamicSearchDTO();
         String searchCode = "";
         JSONObject status = new JSONObject();
-        if (type == 1) {
+
+        int mall = 1;
+        int mallInfomation = 2;
+        if (type == mall) {
             if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) {
                 searchCode = "gic_mall_goods";
             } else if (Constant.CHANNEL_CODE_ERP.equals(channelCode)) {
                 searchCode = "erp_goods";
             }
-        } else if (type == 2) {
+        } else if (type == mallInfomation) {
             if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) {
                 searchCode = "gic_mall_goods_self";
             }
@@ -243,7 +261,7 @@ public class AppletConfigGoodsController extends BaseGoodsController {
                 status = QueryConditionAssemblyUtil.createSimpleQueryNode("status", OperateEnum.OPERATE_EQ, 2);
             }
             if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) {
-                status = QueryConditionAssemblyUtil.addQueryNodeForSiblin(status, QueryConditionAssemblyUtil.createSimpleQueryNode("upShelfTime", OperateEnum.OPERATE_LTE, new Date().getTime()), OperateEnum.OPERATE_AND);
+                status = QueryConditionAssemblyUtil.addQueryNodeForSiblin(status, QueryConditionAssemblyUtil.createSimpleQueryNode("upShelfTime", OperateEnum.OPERATE_LTE, System.currentTimeMillis()), OperateEnum.OPERATE_AND);
             }
         }
         String enterpriseId = getEnterpriseId() + "";
@@ -302,7 +320,6 @@ public class AppletConfigGoodsController extends BaseGoodsController {
      * @param cordId
      * @return 调试接口
      */
-    //@RequestMapping("list-integral-goods-selector")
     public RestResponse listIntegralGoodsByChannel(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
                                                    @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, String appConfigId, Long cordId,String sortColumn,String ids,Integer proType) {
 
@@ -330,11 +347,11 @@ public class AppletConfigGoodsController extends BaseGoodsController {
         }
         if (ids != null) {
             List<Long> collect = Splitter.on(",").splitToList(ids).stream().map(x -> Long.parseLong(x)).collect(Collectors.toList());
-            JSONObject   goodsIdsJSON = QueryConditionAssemblyUtil.createSimpleQueryNode("id", OperateEnum.OPERATE_CONTAIN, Joiner.on(" ").join(collect));
+            JSONObject   goodsIdsJson = QueryConditionAssemblyUtil.createSimpleQueryNode("id", OperateEnum.OPERATE_CONTAIN, Joiner.on(" ").join(collect));
             JSONObject strategyJson = QueryConditionAssemblyUtil.createSimpleQueryNode("strategyFlag", OperateEnum.OPERATE_EQ, 0);
-            JSONObject strategyAndgoodsIdsJSON = QueryConditionAssemblyUtil.addQueryNodeForSiblin(goodsIdsJSON, strategyJson, OperateEnum.OPERATE_OR);
-            json = QueryConditionAssemblyUtil.addQueryNodeForSiblin(json, strategyAndgoodsIdsJSON, OperateEnum.OPERATE_AND);
-            jsonArray.add(strategyAndgoodsIdsJSON);
+            JSONObject strategyAndgoodsIdsJson = QueryConditionAssemblyUtil.addQueryNodeForSiblin(goodsIdsJson, strategyJson, OperateEnum.OPERATE_OR);
+            json = QueryConditionAssemblyUtil.addQueryNodeForSiblin(json, strategyAndgoodsIdsJson, OperateEnum.OPERATE_AND);
+            jsonArray.add(strategyAndgoodsIdsJson);
         }else{
             JSONObject strategyJson = QueryConditionAssemblyUtil.createSimpleQueryNode("strategyFlag", OperateEnum.OPERATE_EQ, 0);
             json = QueryConditionAssemblyUtil.addQueryNodeForSiblin(json, strategyJson, OperateEnum.OPERATE_AND);

src/main/java/com/gic/plug/web/controller/goods/BaseGoodsController.java

@@ -3,7 +3,13 @@ package com.gic.plug.web.controller.goods;
 import com.gic.enterprise.base.EnterpriseInfo;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.mall.base.api.exception.GicMallException;
-
+/**
+ * 商品
+ * @ClassName: BaseGoodsController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:45 AM

+ */
 public class BaseGoodsController {
 
     EnterpriseInfo getLoginEnterpriseInfo() {

src/main/java/com/gic/plug/web/controller/goods/GoodsBrandController.java

@@ -25,7 +25,13 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
+/**
+ * 商品
+ * @ClassName: GoodsBrandController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:43 AM

+ */
 @RestController
 public class GoodsBrandController extends BaseGoodsController {
 
@@ -55,14 +61,14 @@ public class GoodsBrandController extends BaseGoodsController {
         } else {
             Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
                     UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
-            ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService
+            ServiceResponse<GoodsRightsSelectorDTO> selectorDtoServiceResponse = goodsRightsSelectorApiService
                     .getGoodsRightsSelector(resourceId, getEnterpriseId()
                             , UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
-            if (!selectorDTOServiceResponse.isSuccess() || selectorDTOServiceResponse.getResult() == null ||
-                    selectorDTOServiceResponse.getResult().getHasRights() == Constant.NO) {
+            if (!selectorDtoServiceResponse.isSuccess() || selectorDtoServiceResponse.getResult() == null ||
+                    selectorDtoServiceResponse.getResult().getHasRights() == Constant.NO) {
                 return RestResponse.success(Collections.EMPTY_LIST);
             }
-            goodsRightsBrands = selectorDTOServiceResponse.getResult().getGoodsRightsBrands();
+            goodsRightsBrands = selectorDtoServiceResponse.getResult().getGoodsRightsBrands();
         }
         // 是否最高权限
         List<Long> branIdList = new ArrayList<>();

src/main/java/com/gic/plug/web/controller/goods/GoodsCategoryController.java

@@ -14,7 +14,13 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-
+/**
+ * 商品
+ * @ClassName: GoodsCategoryController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:44 AM

+ */
 @RestController
 public class GoodsCategoryController extends BaseGoodsController {
 

src/main/java/com/gic/plug/web/controller/goods/GoodsController.java

@@ -50,9 +50,9 @@ public class GoodsController extends BaseGoodsController {
      * @author xub
      */
     @GetMapping("list-goods")
-    public RestResponse ListGoods(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
+    public RestResponse listGoods(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
                                  @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search,String channelCode) {
-        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search,channelCode);
+        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchEs(currentPage,pageSize,goodsDomainId,search,channelCode);
         if (serviceResponse.isSuccess()) {
             return RestResponse.success(serviceResponse.getResult());
         }
@@ -68,9 +68,9 @@ public class GoodsController extends BaseGoodsController {
      * @author xub
      */
     @GetMapping("list-sku")
-    public RestResponse ListSku(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
+    public RestResponse listSku(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
                                  @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search,String channelCode) {
-        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search ,channelCode);
+        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchEs(currentPage,pageSize,goodsDomainId,search ,channelCode);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }
@@ -80,13 +80,13 @@ public class GoodsController extends BaseGoodsController {
             return RestResponse.success(Collections.EMPTY_LIST);
         }
         //1、获取商品信息
-        List<GoodsVO> goodsVOS = Lists.newArrayList();
+        List<GoodsVO> goodsVoS = Lists.newArrayList();
         for (JSONObject jsonObject : list) {
             GoodsVO goodsVO = JSONObject.toJavaObject(jsonObject, GoodsVO.class);
-            goodsVOS.add(goodsVO);
+            goodsVoS.add(goodsVO);
         }
        //2、获取商品ID信息
-        List<Long> goodsIds = goodsVOS.stream().mapToLong(GoodsVO::getGoodsId).boxed().collect(Collectors.toList());
+        List<Long> goodsIds = goodsVoS.stream().mapToLong(GoodsVO::getGoodsId).boxed().collect(Collectors.toList());
         ServiceResponse<List<GoodsSkuDTO>> skuResponse = goodsApiService.listSku(goodsIds, channelCode, getEnterpriseId());
         if (!skuResponse.isSuccess()) {
             return RestResponse.failure(skuResponse.getCode(), skuResponse.getMessage());
@@ -99,19 +99,19 @@ public class GoodsController extends BaseGoodsController {
         }
         Map<Long, List<GoodsSkuDTO>> goodsIdAndskuDto = skuDTOList.stream().collect(Collectors.groupingBy(GoodsSkuDTO::getGoodsId));
         //4、商品信息中包含是sku信息
-        for (GoodsVO goodsVO : goodsVOS) {
+        for (GoodsVO goodsVO : goodsVoS) {
             if (goodsIdAndskuDto.containsKey(goodsVO.getGoodsId())) {
                 List<GoodsVO.SkuVO> skuVOList = EntityUtil.changeEntityListByOrika(GoodsVO.SkuVO.class,goodsIdAndskuDto.get(goodsVO.getGoodsId()));
                 goodsVO.setSkuVOList(skuVOList);
             }
         }
-        return RestResponse.success(goodsVOS);
+        return RestResponse.success(goodsVoS);
     }
 
 
 
 
-    private ServiceResponse<ESResponseQueryBatchDTO> searchES( Integer currentPage,Integer pageSize, Long goodsDomainId,String search,String channelCode) {
+    private ServiceResponse<ESResponseQueryBatchDTO> searchEs( Integer currentPage,Integer pageSize, Long goodsDomainId,String search,String channelCode) {
         DynamicSearchDTO searchDTO = new DynamicSearchDTO();
         String columnCategoryCode = Constant.ES_CODES_MAP.get(channelCode);
         String esName = esScreeningSearchService.getCurrentEsName(getEnterpriseId() + "", columnCategoryCode);

src/main/java/com/gic/plug/web/controller/goods/GoodsDomainController.java

@@ -21,7 +21,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
-
+/**
+ * 门店
+ * @ClassName: GoodsDomainController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:55 AM

+ */
 @RestController
 public class GoodsDomainController extends BaseGoodsController {
 
@@ -43,7 +49,8 @@ public class GoodsDomainController extends BaseGoodsController {
      */
     @RequestMapping("/get-all-goods-domain-list-for-rights")
     public RestResponse getAllGoodsDomainListForRights() {
-        ServiceResponse<List<GoodsDomainDTO>> serviceResponse = goodsDomainApiService.listAll(getEnterpriseId(), null);
+        ServiceResponse<List<GoodsDomainDTO>> serviceResponse = goodsDomainApiService
+                .listAll(getEnterpriseId(), (String) null);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }
@@ -73,16 +80,16 @@ public class GoodsDomainController extends BaseGoodsController {
         } else {
             Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
                     UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
-            ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
+            ServiceResponse<GoodsRightsSelectorDTO> selectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                     getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
-            if (!selectorDTOServiceResponse.isSuccess() || selectorDTOServiceResponse.getResult() == null ||
-                    selectorDTOServiceResponse.getResult().getHasRights() == Constant.NO) {
+            if (!selectorDtoServiceResponse.isSuccess() || selectorDtoServiceResponse.getResult() == null ||
+                    selectorDtoServiceResponse.getResult().getHasRights() == Constant.NO) {
                 return RestResponse.success(Collections.EMPTY_LIST);
             }
-            goodsDomian = selectorDTOServiceResponse.getResult().getGoodsRightsDomains();
-            hasRights = selectorDTOServiceResponse.getResult().getHasRights();
+            goodsDomian = selectorDtoServiceResponse.getResult().getGoodsRightsDomains();
+            hasRights = selectorDtoServiceResponse.getResult().getHasRights();
         }
-        ServiceResponse<List<GoodsDomainDTO>> serviceResponse = goodsDomainApiService.listAll(getEnterpriseId(), null);
+        ServiceResponse<List<GoodsDomainDTO>> serviceResponse = goodsDomainApiService.listAll(getEnterpriseId(), (String) null);
         // 是否最高权限
         boolean isHighestRights = true;
         JSONObject json = null;
@@ -113,10 +120,12 @@ public class GoodsDomainController extends BaseGoodsController {
         for (GoodsDomainDTO goodsDomainDTO : goodsDomainDTOList) {
             if (CollectionUtils.isNotEmpty(goodsDomainDTO.getChannels())) {
                 for (String channelCode : goodsDomainDTO.getChannels()) {
-                    if (isHighestRights) {  // 最高权限所有都显示
+                    // 最高权限所有都显示
+                    if (isHighestRights) {
                         map.putIfAbsent(channelCode, new ArrayList<>());
                         map.get(channelCode).add(goodsDomainDTO);
-                    } else { //非最高权限按权限下有什么就刷什么来
+                    } else {
+                        //非最高权限按权限下有什么就刷什么来
                         if (json != null && json.containsKey(channelCode)) {
                             map.putIfAbsent(channelCode, new ArrayList<>());
                             JSONArray array = json.getJSONArray(channelCode);

src/main/java/com/gic/plug/web/controller/goods/GoodsPropertyController.java

@@ -18,7 +18,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 商品
+ * @ClassName: GoodsPropertyController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:44 AM

+ */
 @RestController
 public class GoodsPropertyController extends BaseGoodsController {
 

src/main/java/com/gic/plug/web/controller/goods/GoodsRightsSelectorController.java

@@ -14,7 +14,13 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
+/**
+ * 商品
+ * @ClassName: GoodsRightsSelectorController

+ * @Description: 

+ * @author maj

+ * @date 2020/9/14 10:41 AM

+ */
 @RestController
 public class GoodsRightsSelectorController extends BaseGoodsController {
 

src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java

@@ -17,7 +17,13 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
+/**
+ * 商品
+ * @ClassName: GoodsSelectorController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:55 AM

+ */
 @RestController
 public class GoodsSelectorController extends BaseGoodsController {
 
@@ -64,12 +70,12 @@ public class GoodsSelectorController extends BaseGoodsController {
         goodsSelectorDTO.setEnterpriseId(getEnterpriseId());
         Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
                 UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
-        if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
-            return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
+        if (!goodsRightsSelectorDtoServiceResponse.isSuccess()) {
+            return RestResponse.failure(goodsRightsSelectorDtoServiceResponse.getCode(), goodsRightsSelectorDtoServiceResponse.getMessage());
         }
-        GoodsRightsSelectorDTO goodsRightsSelectorDTO = goodsRightsSelectorDTOServiceResponse.getResult();
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = goodsRightsSelectorDtoServiceResponse.getResult();
         goodsSelectorDTO.setHasRights(goodsRightsSelectorDTO.getHasRights());
         goodsSelectorDTO.setGoodsSearchRightValue(goodsRightsSelectorDTO.getGoodsRightsSearchValue());
         goodsSelectorDTO.setGoodsSearchRightText(goodsRightsSelectorDTO.getGoodsRightsSearchText());
@@ -90,12 +96,12 @@ public class GoodsSelectorController extends BaseGoodsController {
         goodsSelectorDTO.setEnterpriseId(getEnterpriseId());
         Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
                 UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
-        if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
-            return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
+        if (!goodsRightsSelectorDtoServiceResponse.isSuccess()) {
+            return RestResponse.failure(goodsRightsSelectorDtoServiceResponse.getCode(), goodsRightsSelectorDtoServiceResponse.getMessage());
         }
-        GoodsRightsSelectorDTO goodsRightsSelectorDTO = goodsRightsSelectorDTOServiceResponse.getResult();
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = goodsRightsSelectorDtoServiceResponse.getResult();
         goodsSelectorDTO.setHasRights(goodsRightsSelectorDTO.getHasRights());
         goodsSelectorDTO.setGoodsSearchRightValue(goodsRightsSelectorDTO.getGoodsRightsSearchValue());
         goodsSelectorDTO.setGoodsSearchRightText(goodsRightsSelectorDTO.getGoodsRightsSearchText());
@@ -126,19 +132,19 @@ public class GoodsSelectorController extends BaseGoodsController {
         }
         Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
                 UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
-        if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
-            return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
+        if (!goodsRightsSelectorDtoServiceResponse.isSuccess()) {
+            return RestResponse.failure(goodsRightsSelectorDtoServiceResponse.getCode(), goodsRightsSelectorDtoServiceResponse.getMessage());
         }
         if (goodsSelectorId == null) {
             GoodsRightsSelectorDTO goodsRightsSelectorDTO = new GoodsRightsSelectorDTO();
-            goodsRightsSelectorDTO.setGoodsRightsSearchText(goodsRightsSelectorDTOServiceResponse.getResult().getGoodsRightsSearchText());
-            goodsRightsSelectorDTO.setGoodsRightsSearchValue(goodsRightsSelectorDTOServiceResponse.getResult().getGoodsRightsSearchValue());
-            goodsRightsSelectorDTO.setHasRights(goodsRightsSelectorDTOServiceResponse.getResult().getHasRights());
+            goodsRightsSelectorDTO.setGoodsRightsSearchText(goodsRightsSelectorDtoServiceResponse.getResult().getGoodsRightsSearchText());
+            goodsRightsSelectorDTO.setGoodsRightsSearchValue(goodsRightsSelectorDtoServiceResponse.getResult().getGoodsRightsSearchValue());
+            goodsRightsSelectorDTO.setHasRights(goodsRightsSelectorDtoServiceResponse.getResult().getHasRights());
             return  RestResponse.success(goodsRightsSelectorDTO);
         }
-        GoodsRightsSelectorDTO goodsRightsSelectorDTO = goodsRightsSelectorDTOServiceResponse.getResult();
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = goodsRightsSelectorDtoServiceResponse.getResult();
         ServiceResponse<GoodsSelectorDTO> serviceResponse =  goodsSelectorApiService.updateGoodsSelectorRights(goodsSelectorId,
                 goodsRightsSelectorDTO.getGoodsRightsSearchText(), goodsRightsSelectorDTO.getGoodsRightsSearchValue(), goodsRightsSelectorDTO.getHasRights(), goodsRightsSelectorDTO.getGoodsRightsBrands(), goodsRightsSelectorDTO.getGoodsRightsDomains(), getEnterpriseId());
         if (!serviceResponse.isSuccess()) {

src/main/java/com/gic/plug/web/controller/goods/GoodsStandardController.java

@@ -17,7 +17,13 @@ import com.gic.plug.web.vo.goods.GoodsStandardValueVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
+/**
+ * 商品
+ * @ClassName: GoodsStandardController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:44 AM

+ */
 @RestController
 public class GoodsStandardController extends BaseGoodsController {
 

src/main/java/com/gic/plug/web/qo/PageQO.java

-package com.gic.store.web.qo;
+package com.gic.plug.web.qo;
 
 import java.io.Serializable;
 

src/main/java/com/gic/plug/web/qo/StoreWidgetCountQO.java

 package com.gic.plug.web.qo;
 
 import java.io.Serializable;
-
+/**
+ * 门店
+ * @ClassName: StoreWidgetCountQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:45 AM

+ */
 public class StoreWidgetCountQO implements Serializable {
     private String authSearchJson;
     private String searchJson;

src/main/java/com/gic/plug/web/qo/StoreWidgetQO.java

 package com.gic.plug.web.qo;
 
 import java.io.Serializable;
-
+/**
+ * 门店选择器
+ * @ClassName: StoreWidgetQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:38 AM

+ */
 public class StoreWidgetQO implements Serializable {
     private Integer storeWidgetId;
     private String authSearchParam;

src/main/java/com/gic/plug/web/qo/goods/GoodsQO.java

 package com.gic.plug.web.qo.goods;
-
+/**
+ * test
+ * @ClassName: GoodsQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsQO {
 }

src/main/java/com/gic/plug/web/qo/goods/GoodsRightsSelectorSaveQO.java

 package com.gic.plug.web.qo.goods;
-
+/**
+ * 商品
+ * @ClassName: GoodsRightsSelectorSaveQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:39 AM

+ */
 public class GoodsRightsSelectorSaveQO {
 
     /**

src/main/java/com/gic/plug/web/qo/goods/GoodsRightsSelectorUpdateQO.java

 package com.gic.plug.web.qo.goods;
-
+/**
+ * 商品
+ * @ClassName: GoodsRightsSelectorUpdateQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:39 AM

+ */
 public class GoodsRightsSelectorUpdateQO {
 
     /**

src/main/java/com/gic/plug/web/qo/goods/GoodsSelectorSaveQO.java

 package com.gic.plug.web.qo.goods;
-
+/**
+ * 商品
+ * @ClassName: GoodsSelectorSaveQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:39 AM

+ */
 public class GoodsSelectorSaveQO {
 
     private String goodsSearchValue;

src/main/java/com/gic/plug/web/qo/goods/GoodsSelectorUpdateQO.java

 package com.gic.plug.web.qo.goods;
-
+/**
+ * 商品
+ * @ClassName: GoodsSelectorUpdateQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:39 AM

+ */
 public class GoodsSelectorUpdateQO {
 
     private Long goodsSelectorId;

src/main/java/com/gic/plug/web/strategy/ScreenBackStrategy.java

 package com.gic.plug.web.strategy;
 
 import com.gic.plug.web.vo.ScreenBack;
-
+/**
+ * 回显
+ * @ClassName: ScreenBackStrategy

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:36 AM

+ */
 public interface ScreenBackStrategy {
+    /**
+     * 回显
+     * @Title: screenBack

+     * @Description:
+    
* @author guojuxing
+     * @param compute
+     * @param value
+     * @param key
+     * @param enterpriseId

+     * @return  com.gic.plug.web.vo.ScreenBack

+     * @throws ClassNotFoundException
+    
*/
     ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) throws ClassNotFoundException;
 }

src/main/java/com/gic/plug/web/strategy/impl/StoreAreaBackImpl.java

@@ -15,7 +15,13 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 门店
+ * @ClassName: StoreAreaBackImpl

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:40 AM

+ */
 @Component
 public class StoreAreaBackImpl implements ScreenBackStrategy {
     @Autowired

src/main/java/com/gic/plug/web/strategy/impl/StoreBackImpl.java

@@ -17,7 +17,13 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 门店回显
+ * @ClassName: StoreBackImpl

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:41 AM

+ */
 @Component
 public class StoreBackImpl implements ScreenBackStrategy {
     @Autowired

src/main/java/com/gic/plug/web/strategy/impl/StoreBrandBackImpl.java

@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 门店品牌
+ * @ClassName: StoreBrandBackImpl

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:40 AM

+ */
 @Component
 public class StoreBrandBackImpl implements ScreenBackStrategy {
     @Autowired

src/main/java/com/gic/plug/web/strategy/impl/StoreCustomBackImpl.java

@@ -30,7 +30,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+/**
+ * 门店
+ * @ClassName: StoreCustomBackImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:55 AM

+ */
 @Component
 public class StoreCustomBackImpl implements ScreenBackStrategy {
     private static Logger log = LogManager.getLogger(StoreCustomBackImpl.class);
@@ -113,12 +119,12 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
         }
         ServiceResponse<List<StoreFieldSelectDTO>> listServiceResponse = this.storeFieldSelectApiService.listStoreFieldSelectByIds(enterpriseId, list);
         if (listServiceResponse.isSuccess()) {
-            List<StoreFieldSelectDTO> selectDTOS = listServiceResponse.getResult();
+            List<StoreFieldSelectDTO> selectDtoS = listServiceResponse.getResult();
             List<String> view = new ArrayList<>();
             List<String> hideView = new ArrayList<>();
             int index = 0;
-            if (CollectionUtils.isNotEmpty(selectDTOS)) {
-                for (StoreFieldSelectDTO dto : selectDTOS) {
+            if (CollectionUtils.isNotEmpty(selectDtoS)) {
+                for (StoreFieldSelectDTO dto : selectDtoS) {
                     if(index < 5){
                         view.add(dto.getStoreFieldSelectName());
                     } else {
@@ -150,43 +156,43 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
         return screenBack;
     }
 
-    public String yyyyMMddHHmmssBack(String value) throws ParseException {
+    public String yearMonthDateHourMinuteSecondBack(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
+        SimpleDateFormat simpleDateFormatCommon = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return this.dateBack(value, simpleDateFormat, simpleDateFormatCommon);
     }
 
-    public String yyyyMMddBack(String value) throws ParseException {
+    public String yearMonthDateBack(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
-        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
-        return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
+        SimpleDateFormat simpleDateFormatCommon = new SimpleDateFormat("yyyy-MM-dd");
+        return this.dateBack(value, simpleDateFormat, simpleDateFormatCommon);
     }
 
-    public String yyyyMM(String value) throws ParseException {
+    public String yearMonth(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMM");
-        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM");
-        return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
+        SimpleDateFormat simpleDateFormatCommon = new SimpleDateFormat("yyyy-MM");
+        return this.dateBack(value, simpleDateFormat, simpleDateFormatCommon);
     }
 
-    public String mmddBack(String value) throws ParseException {
+    public String monthDateBack(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MMdd");
-        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("MM-dd");
-        return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
+        SimpleDateFormat simpleDateFormatCommon = new SimpleDateFormat("MM-dd");
+        return this.dateBack(value, simpleDateFormat, simpleDateFormatCommon);
     }
 
-    public String hhmmssBack(String value) throws ParseException {
+    public String hourMinuteSecondBack(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HHmmss");
-        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm:ss");
-        return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
+        SimpleDateFormat simpleDateFormatCommon = new SimpleDateFormat("HH:mm:ss");
+        return this.dateBack(value, simpleDateFormat, simpleDateFormatCommon);
     }
 
-    private String dateBack(String value, SimpleDateFormat simpleDateFormat, SimpleDateFormat simpleDateFormat1) throws ParseException {
+    private String dateBack(String value, SimpleDateFormat simpleDateFormat, SimpleDateFormat simpleDateFormatCommon) throws ParseException {
         String[] valueArr = value.split(" ");
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("【").append(simpleDateFormat1.format(simpleDateFormat.parse(valueArr[0]))).append("】").append(" ");
+        stringBuilder.append("【").append(simpleDateFormatCommon.format(simpleDateFormat.parse(valueArr[0]))).append("】").append(" ");
         if (valueArr.length > 1) {
             stringBuilder.append("至");
-            stringBuilder.append("【").append(simpleDateFormat1.format(simpleDateFormat.parse(valueArr[1]))).append("】").append(" ");
+            stringBuilder.append("【").append(simpleDateFormatCommon.format(simpleDateFormat.parse(valueArr[1]))).append("】").append(" ");
         }
         return stringBuilder.toString();
     }

src/main/java/com/gic/plug/web/strategy/impl/StoreGroupBackImpl.java

@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 门店分组回显
+ * @ClassName: StoreGroupBackImpl

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:40 AM

+ */
 @Component
 public class StoreGroupBackImpl implements ScreenBackStrategy {
     @Autowired

src/main/java/com/gic/plug/web/strategy/impl/StoreRegionBackImpl.java

@@ -13,7 +13,13 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 门店域回显
+ * @ClassName: StoreRegionBackImpl

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:40 AM

+ */
 @Component
 public class StoreRegionBackImpl implements ScreenBackStrategy {
     @Autowired

src/main/java/com/gic/plug/web/strategy/impl/StoreSelectBackImpl.java

@@ -23,7 +23,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+/**
+ * 门店
+ * @ClassName: StoreSelectBackImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:55 AM

+ */
 @Component
 public class StoreSelectBackImpl implements ScreenBackStrategy {
     private static Logger log = LogManager.getLogger(StoreSelectBackImpl.class);
@@ -65,7 +71,13 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
         return null;
     }
 
-    //单选
+    /**
+     * 单选
+     * @param compute
+     * @param value
+     * @param enterpriseId
+     * @return
+     */
     public ScreenBack storeStatusBack(String compute, String value, Integer enterpriseId){
         if(StringUtils.isNotBlank(value)){
             ScreenBack screenBack = new ScreenBack();
@@ -83,7 +95,14 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
         }
         return null;
     }
-    //单选
+
+    /**
+     * 单选
+     * @param compute
+     * @param value
+     * @param enterpriseId
+     * @return
+     */
     public ScreenBack storeCompleteBack(String compute, String value, Integer enterpriseId){
         if(StringUtils.isNotBlank(value)){
             ScreenBack screenBack = new ScreenBack();
@@ -101,7 +120,14 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
         }
         return null;
     }
-    //多选
+
+    /**
+     * 多选
+     * @param compute
+     * @param value
+     * @param enterpriseId
+     * @return
+     */
     public ScreenBack storeCreateTypeBack(String compute, String value, Integer enterpriseId){
         if(StringUtils.isNotBlank(value)){
             ScreenBack screenBack = new ScreenBack();
@@ -128,7 +154,14 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
         }
         return null;
     }
-    //多选
+
+    /**
+     * 多选
+     * @param compute
+     * @param value
+     * @param enterpriseId
+     * @return
+     */
     public ScreenBack storeTypeBack(String compute, String value, Integer enterpriseId){
         if(StringUtils.isNotBlank(value)){
             String[] valueArr = value.split(" ");
@@ -160,7 +193,14 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
         }
         return null;
     }
-    //多选
+
+    /**
+     * 多选
+     * @param compute
+     * @param value
+     * @param enterpriseId
+     * @return
+     */
     public ScreenBack erpStatusBack(String compute, String value, Integer enterpriseId){
         if(StringUtils.isNotBlank(value)){
             String[] valueArr = value.split(" ");

src/main/java/com/gic/plug/web/strategy/impl/StoreTagBackImpl.java

@@ -14,7 +14,13 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 门店表情
+ * @ClassName: StoreTagBackImpl

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:39 AM

+ */
 @Component
 public class StoreTagBackImpl implements ScreenBackStrategy {
     @Autowired

src/main/java/com/gic/plug/web/strategy/init/StrategyInit.java

@@ -9,7 +9,13 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
-
+/**
+ * 回显
+ * @ClassName: StrategyInit

+ * @Description: 

+ * @author boom

+ * @date 2020/9/14 10:41 AM

+ */
 @Component
 public class StrategyInit {
     @Autowired

src/main/java/com/gic/plug/web/utils/ComputeBackUtil.java

@@ -4,7 +4,13 @@ import org.apache.commons.lang.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
-
+/**
+ * 符号
+ * @ClassName: ComputeBackUtil

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:39 AM

+ */
 public class ComputeBackUtil {
     public static Map<String, String> computeMap = new HashMap<>();
     static {

src/main/java/com/gic/plug/web/utils/StoreRegionAuthUtil.java

@@ -13,7 +13,13 @@ import org.apache.commons.collections.CollectionUtils;
 
 import java.util.HashSet;
 import java.util.Set;
-
+/**
+ * 门店
+ * @ClassName: StoreRegionAuthUtil

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:45 AM

+ */
 public class StoreRegionAuthUtil {
     public static Set<String> getUserRegion(StoreWidgetApiService storeWidgetApiService){
         Set<String> authRegionSet = new HashSet<>();

src/main/java/com/gic/plug/web/vo/CityVO.java

@@ -4,7 +4,11 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * tab_city
+ * 城市
+ * @ClassName: CityVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:38 AM

  */
 public class CityVO implements Serializable {
     /**
@@ -60,4 +64,8 @@ public class CityVO implements Serializable {
         this.cityPy = cityPy;
     }
 
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/CountyVO.java

@@ -4,7 +4,11 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * tab_county
+ * 地区
+ * @ClassName: CountyVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:37 AM

  */
 public class CountyVO implements Serializable {
     /**
@@ -86,4 +90,9 @@ public class CountyVO implements Serializable {
     public void setCountyPy(String countyPy) {
         this.countyPy = countyPy;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/ProvinceVO.java

@@ -4,7 +4,11 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * tab_province
+ * 省
+ * @ClassName: ProvinceVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:38 AM

  */
 public class ProvinceVO implements Serializable {
     /**
@@ -47,4 +51,8 @@ public class ProvinceVO implements Serializable {
         this.provincePy = provincePy;
     }
 
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/ScreenBack.java

@@ -2,7 +2,13 @@ package com.gic.plug.web.vo;
 
 import java.io.Serializable;
 import java.util.List;
-
+/**
+ * 门店
+ * @ClassName: ScreenBack

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:45 AM

+ */
 public class ScreenBack implements Serializable {
     private String title;
     private String compute;

src/main/java/com/gic/plug/web/vo/ScreenBackVO.java

 package com.gic.plug.web.vo;
 
 import java.util.List;
-
+/**
+ * 门店
+ * @ClassName: ScreenBackVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:45 AM

+ */
 public class ScreenBackVO {
     private String type = "and";
     private List<ScreenBack> data;
@@ -21,4 +27,9 @@ public class ScreenBackVO {
     public void setData(List<ScreenBack> data) {
         this.data = data;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/StoreDictVO.java

@@ -4,7 +4,11 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * tab_store_dict
+ * 门店字典
+ * @ClassName: StoreDictVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:38 AM

  */
 public class StoreDictVO implements Serializable {
     private String value;
@@ -37,4 +41,9 @@ public class StoreDictVO implements Serializable {
     public void setKey(String key) {
         this.key = key;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/StoreFieldRegionVO.java

@@ -24,7 +24,7 @@ public class StoreFieldRegionVO implements Serializable{
 
     private String storeFieldKey;
 
-     private int dateType;
+     private Integer dateType = 0;
 
     /**
      * 排序
@@ -86,4 +86,9 @@ public class StoreFieldRegionVO implements Serializable{
     public void setDateType(int dateType) {
         this.dateType = dateType;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/StoreFieldSelectVO.java

@@ -48,4 +48,9 @@ public class StoreFieldSelectVO implements Serializable{
     public void setSort(Double sort) {
         this.sort = sort;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/StoreRegionVO.java

@@ -36,4 +36,9 @@ public class StoreRegionVO implements Serializable {
     public void setRegionName(String regionName) {
         this.regionName = regionName;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/StoreResourceVO.java

 package com.gic.plug.web.vo;
 import java.util.List;
+/**
+ * 门店
+ * @ClassName: StoreResourceVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:44 AM

+ */
 public class StoreResourceVO {
     private Integer authMode;
     private String searchJson;
@@ -28,4 +35,9 @@ public class StoreResourceVO {
     public void setSceenBack(List<ScreenBackVO> sceenBack) {
         this.sceenBack = sceenBack;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/StoreVO.java

@@ -35,4 +35,9 @@ public class StoreVO implements Serializable {
     public void setStoreCode(String storeCode) {
         this.storeCode = storeCode;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/StoreWidgetVO.java

@@ -3,7 +3,11 @@ package com.gic.plug.web.vo;
 import java.io.Serializable;
 import java.util.List;
 /**
- * tab_store_widget
+ * 商品
+ * @ClassName: StoreWidgetVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:45 AM

  */
 public class StoreWidgetVO implements Serializable {
     /**
@@ -73,4 +77,9 @@ public class StoreWidgetVO implements Serializable {
     public void setScreenBack(List<ScreenBackVO> screenBack) {
         this.screenBack = screenBack;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/goods/CategoryVO.java

@@ -4,7 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-
+/**
+ * 字典
+ * @ClassName: CategoryVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:38 AM

+ */
 public class CategoryVO implements Serializable {
 
     private static final long serialVersionUID = -8126896401928702304L;
@@ -207,4 +213,9 @@ public class CategoryVO implements Serializable {
     public void setNextChild(Boolean nextChild) {
         this.nextChild = nextChild;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsBrandVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsBrandVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsBrandVO {
 
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -34,4 +40,9 @@ public class GoodsBrandVO {
     public void setBrandCode(String brandCode) {
         this.brandCode = brandCode;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsCategoryVO.java

 package com.gic.plug.web.vo.goods;
-
+/**
+ * 商品
+ * @ClassName: GoodsCategoryVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:43 AM

+ */
 public class GoodsCategoryVO {
 
     /**
@@ -17,7 +23,7 @@ public class GoodsCategoryVO {
      */
     private String specCategoryCode;
 
-    private boolean hasChild;
+    private Boolean hasChild = false;
 
     public Long getSpecCategoryId() {
         return specCategoryId;
@@ -50,4 +56,9 @@ public class GoodsCategoryVO {
     public void setHasChild(boolean hasChild) {
         this.hasChild = hasChild;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsChannelVO.java

 package com.gic.plug.web.vo.goods;
 
 import java.util.List;
-
+/**
+ * 商品
+ * @ClassName: GoodsChannelVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsChannelVO {
 
     private String channelCode;
@@ -43,4 +49,9 @@ public class GoodsChannelVO {
     public void setSceneCode(String sceneCode) {
         this.sceneCode = sceneCode;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsCordVO.java

@@ -135,4 +135,8 @@ public class GoodsCordVO {
         this.sort = sort;
     }
 
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/goods/GoodsDomainVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsDomainVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsDomainVO {
 
     private String domainCode;
@@ -34,4 +40,9 @@ public class GoodsDomainVO {
     public void setDomainId(Long domainId) {
         this.domainId = domainId;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsPropertyVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsPropertyVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:44 AM

+ */
 public class GoodsPropertyVO {
 
     /**
@@ -70,4 +76,9 @@ public class GoodsPropertyVO {
     public void setPoints(Integer points) {
         this.points = points;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsPropertyValueVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsPropertyValueVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:44 AM

+ */
 public class GoodsPropertyValueVO {
     /**
      *
@@ -42,4 +48,9 @@ public class GoodsPropertyValueVO {
     public void setSpecPropertyValueCode(String specPropertyValueCode) {
         this.specPropertyValueCode = specPropertyValueCode;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsRightsSelectorVO.java

@@ -3,7 +3,13 @@ package com.gic.plug.web.vo.goods;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsRightsSelectorVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsRightsSelectorVO {
     /**
      *
@@ -158,4 +164,9 @@ public class GoodsRightsSelectorVO {
     public void setFindCount(Long findCount) {
         this.findCount = findCount;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsSelectorVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsSelectorVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsSelectorVO {
 
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -110,4 +116,9 @@ public class GoodsSelectorVO {
     public void setHasRights(Integer hasRights) {
         this.hasRights = hasRights;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsStandardVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsStandardVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:43 AM

+ */
 public class GoodsStandardVO {
 
     /**
@@ -43,4 +49,9 @@ public class GoodsStandardVO {
     public void setSpecStandardCode(String specStandardCode) {
         this.specStandardCode = specStandardCode;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsStandardValueGroupVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsStandardValueGroupVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsStandardValueGroupVO {
     /**
      *
@@ -42,4 +48,9 @@ public class GoodsStandardValueGroupVO {
     public void setSpecStandardValueGroupCode(String specStandardValueGroupCode) {
         this.specStandardValueGroupCode = specStandardValueGroupCode;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsStandardValueVO.java

 package com.gic.plug.web.vo.goods;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: GoodsStandardValueVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:42 AM

+ */
 public class GoodsStandardValueVO {
 
     /**
@@ -43,4 +49,9 @@ public class GoodsStandardValueVO {
     public void setSpecStandardValueCode(String specStandardValueCode) {
         this.specStandardValueCode = specStandardValueCode;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsTagVO.java

@@ -73,4 +73,8 @@ public class GoodsTagVO {
         this.specTagCode = specTagCode;
     }
 
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/goods/GoodsVO.java

@@ -116,6 +116,15 @@ public class GoodsVO {
         public void setGoodsSkuCode(String goodsSkuCode) {
             this.goodsSkuCode = goodsSkuCode;
         }
+
+        @Override
+        public String toString() {
+            return super.toString();
+        }
     }
 
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gic/plug/web/vo/goods/MallGoodsCordVO.java

@@ -3,7 +3,13 @@ package com.gic.plug.web.vo.goods;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+/**
+ * 商品
+ * @ClassName: MallGoodsCordVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/14 10:44 AM

+ */
 public class MallGoodsCordVO {
 
     /**
@@ -138,4 +144,9 @@ public class MallGoodsCordVO {
     public void setChildSpecCordDTOList(List<MallGoodsCordVO> childSpecCordDTOList) {
         this.childSpecCordDTOList = childSpecCordDTOList;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }