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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreCertInfoVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreCertInfoVo", description = "店铺管理:认证信息")
+@Data
+public class GoblinStoreCertInfoVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -7125674300755279796L;
+    @ApiModelProperty(position = 10, value = "认证类型[1-企业/公司|2-个体工商户]")
+    private String certType;
+    @ApiModelProperty(position = 11, value = "证件类型[1-二代居民身份证]")
+    private String personCertType;
+    @ApiModelProperty(position = 12, value = "证件姓名[32]")
+    private String personName;
+    @ApiModelProperty(position = 13, value = "证件号码[32]")
+    private String personCertCode;
+    @ApiModelProperty(position = 14, value = "证件有效期[50]")
+    private String personCertValidity;
+    @ApiModelProperty(position = 15, value = "证件是否长期有效[0-否|1-是]")
+    private String personCertLasting;
+    @ApiModelProperty(position = 16, value = "证件正面照[256]")
+    private String personCertFpic;
+    @ApiModelProperty(position = 17, value = "证件背面照[256]")
+    private String personCertBpic;
+    @ApiModelProperty(position = 18, value = "证件背面照[256]")
+    private String personCertSpic;
+    @ApiModelProperty(position = 19, value = "删除标记[0-未删除|1-删除]")
+    private String delFlg;
+    @ApiModelProperty(position = 20, value = "省ID[20]")
+    private String provinceId;
+    @ApiModelProperty(position = 21, value = "省名称[32]")
+    private String provinceName;
+    @ApiModelProperty(position = 22, value = "市ID[20]")
+    private String cityId;
+    @ApiModelProperty(position = 23, value = "市名称[32]")
+    private String cityName;
+    @ApiModelProperty(position = 24, value = "县ID[20]")
+    private String countyId;
+    @ApiModelProperty(position = 25, value = "县名称[32]")
+    private String countyName;
+    @ApiModelProperty(position = 26, value = "详细地址[128]")
+    private String busAddress;
+    @ApiModelProperty(position = 27, value = "商户名称[64]")
+    private String busName;
+    @ApiModelProperty(position = 28, value = "统一社会信用代码[32]")
+    private String busCertCode;
+    @ApiModelProperty(position = 29, value = "营业执照有效期[50]")
+    private String busCertValidity;
+    @ApiModelProperty(position = 30, value = "证件是否长期有效[0-否|1-是]")
+    private String busCertLasting;
+    @ApiModelProperty(position = 31, value = "营业执照照片[256]")
+    private String busCertPic;
+    @ApiModelProperty(position = 32, value = "资质证书照片[256]")
+    private String busQualityPic;
+
+    private static final GoblinStoreCertInfoVo obj = new GoblinStoreCertInfoVo();
+    public static GoblinStoreCertInfoVo getNew() {
+        try {
+            return (GoblinStoreCertInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreCertInfoVo();
+        }
+    }
+
+    public GoblinStoreCertInfoVo copy(GoblinStoreInfoVo source) {
+        if (null == source) return this;
+        this.setCertType(source.getCertType());
+        GoblinStoreCertificationVo certificationVo = source.getCertificationVo();
+        if (null == certificationVo) return this;
+        this.setPersonCertType(certificationVo.getPersonCertType());
+        this.setPersonName(certificationVo.getPersonName());
+        this.setPersonCertCode(certificationVo.getPersonCertCode());
+        this.setPersonCertValidity(certificationVo.getPersonCertValidity());
+        this.setPersonCertLasting(certificationVo.getPersonCertLasting());
+        this.setPersonCertFpic(certificationVo.getPersonCertFpic());
+        this.setPersonCertBpic(certificationVo.getPersonCertBpic());
+        this.setPersonCertSpic(certificationVo.getPersonCertSpic());
+
+        this.setProvinceId(certificationVo.getProvinceId());
+        this.setProvinceName(certificationVo.getProvinceName());
+        this.setCityId(certificationVo.getCityId());
+        this.setCityName(certificationVo.getCityName());
+        this.setCountyId(certificationVo.getCountyId());
+        this.setCountyName(certificationVo.getCountyName());
+        this.setBusAddress(certificationVo.getBusAddress());
+        this.setBusName(certificationVo.getBusName());
+        this.setBusCertCode(certificationVo.getBusCertCode());
+        this.setBusCertValidity(certificationVo.getBusCertValidity());
+        this.setBusCertLasting(certificationVo.getBusCertLasting());
+        this.setBusCertPic(certificationVo.getBusCertPic());
+        this.setBusQualityPic(certificationVo.getBusQualityPic());
+        return this;
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtCategoryController.java

@@ -46,7 +46,18 @@ public class GoblinStoreMgtCategoryController {
     })
     @GetMapping("list")
     public ResponseDto<List<GoblinStoreGoodsCategoryVo>> list(@NotBlank(message = "店铺ID不能为空") @RequestParam String storeId) {
-        return ResponseDto.success(goblinStoreMgtCategoryService.list(storeId));
+        List<GoblinStoreGoodsCategoryVo> storeGoodsCategoryVos = goblinStoreMgtCategoryService.list(storeId);
+        storeGoodsCategoryVos.clear();// TODO: 2022/1/12 zhanggb del
+        storeGoodsCategoryVos.add(
+                GoblinStoreGoodsCategoryVo.getNew().setCateId("10000").setName("1级").setSort(1).setGrade("1").setNeIsbn("0")
+        );
+        storeGoodsCategoryVos.add(
+                GoblinStoreGoodsCategoryVo.getNew().setCateId("10100").setName("2级").setSort(1).setGrade("2").setNeIsbn("0").setCatePid("10000")
+        );
+        storeGoodsCategoryVos.add(
+                GoblinStoreGoodsCategoryVo.getNew().setCateId("10101").setName("3级").setSort(1).setGrade("3").setNeIsbn("1").setCatePid("10100")
+        );
+        return ResponseDto.success(storeGoodsCategoryVos);
     }
 
     @ApiOperationSupport(order = 2)

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtController.java

@@ -8,10 +8,13 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.manage.*;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtConfigEditParam;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtNoticeActionParam;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtNoticeAddParam;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtNoticeFilterParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtThumbVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinStoreCertificationVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreCertInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreConfigVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreNoticeVo;
@@ -109,10 +112,9 @@ public class GoblinStoreMgtController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID[64]"),
     })
     @GetMapping(value = {"info/cer"})
-    public ResponseDto<GoblinStoreCertificationVo> certInfo(@NotBlank(message = "店铺ID不能为空") @Size(max = 64) @RequestParam String storeId) {
+    public ResponseDto<GoblinStoreCertInfoVo> certInfo(@NotBlank(message = "店铺ID不能为空") @Size(max = 64) @RequestParam String storeId) {
         // TODO: 2022/1/12 zhanggb 逻辑校验
-        GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVo(storeId);
-        return ResponseDto.success(null == storeInfoVo ? null : storeInfoVo.getCertificationVo());
+        return ResponseDto.success(GoblinStoreCertInfoVo.getNew().copy(goblinRedisUtils.getStoreInfoVo(storeId)));
     }
 
     @ApiOperationSupport(order = 5)

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtExtraController.java

@@ -43,20 +43,19 @@ public class GoblinStoreMgtExtraController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "平台商品分类")
     @GetMapping("sg_categorys")
-    public ResponseDto<List<GoblinSelfGoodsCategoryVo>> selfGoodsCategoryList(@RequestParam String cateId) {
-        if (StringUtils.isBlank(cateId)) return ResponseDto.success();
+    public ResponseDto<List<GoblinSelfGoodsCategoryVo>> selfGoodsCategoryList() {
         // TODO: 2022/1/11 redis+mongo.get
-        ArrayList<GoblinSelfGoodsCategoryVo> selfGoodsCategoryVoList = ObjectUtil.getGoblinSelfGoodsCategoryVoArrayList();
-        selfGoodsCategoryVoList.add(
-                GoblinSelfGoodsCategoryVo.getNew().setCateId("100000").setName("1级").setSort(1).setGrade("1").setNeIsbn("0")
+        ArrayList<GoblinSelfGoodsCategoryVo> selfGoodsCategoryVos = ObjectUtil.getGoblinSelfGoodsCategoryVoArrayList();
+        selfGoodsCategoryVos.add(
+                GoblinSelfGoodsCategoryVo.getNew().setCateId("10000").setName("1级").setSort(1).setGrade("1").setNeIsbn("0").setCatePid(null)
         );
-        selfGoodsCategoryVoList.add(
-                GoblinSelfGoodsCategoryVo.getNew().setCateId("100100").setName("2级").setSort(1).setGrade("2").setNeIsbn("0")
+        selfGoodsCategoryVos.add(
+                GoblinSelfGoodsCategoryVo.getNew().setCateId("10100").setName("2级").setSort(1).setGrade("2").setNeIsbn("0").setCatePid("10000")
         );
-        selfGoodsCategoryVoList.add(
-                GoblinSelfGoodsCategoryVo.getNew().setCateId("200000").setName("3级").setSort(1).setGrade("3").setNeIsbn("1")
+        selfGoodsCategoryVos.add(
+                GoblinSelfGoodsCategoryVo.getNew().setCateId("10101").setName("3级").setSort(1).setGrade("3").setNeIsbn("1").setCatePid("10100")
         );
-        return ResponseDto.success(null);
+        return ResponseDto.success(selfGoodsCategoryVos);
     }
 
     @ApiOperationSupport(order = 2)

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -47,7 +47,7 @@ public class GoblinMongoUtils {
 
     public List<GoblinStoreGoodsCategoryVo> getStoreGoodsCategoryVos(String storeId) {
         return mongoTemplate.find(Query.query(Criteria.where("storeId").is(storeId)),
-                GoblinStoreGoodsCategoryVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+                GoblinStoreGoodsCategoryVo.class, GoblinStoreGoodsCategoryVo.class.getSimpleName());
     }
 
     /* ---------------------------------------- 平台分类规格数据源 ---------------------------------------- */