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

alien-entity/src/main/java/shop/alien/entity/store/dto/StoreInfoDto.java

@@ -120,7 +120,6 @@ public class StoreInfoDto {
     private Integer businessSection;
 
     @ApiModelProperty(value = "经营种类ids")
-    @JsonDeserialize(using = StringToListDeserializer.class)
     private List<String> businessTypes;
 
     @ApiModelProperty(value = "经营种类名称s")
@@ -184,9 +183,11 @@ public class StoreInfoDto {
     private Date foodLicenceExpirationTime;
 
     @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
-    @JsonDeserialize(using = StringToListDeserializer.class)
     private List<String> businessClassify;
 
+    @ApiModelProperty(value = "分类名称")
+    private String businessClassifyName;
+
     @ApiModelProperty(value = "是否提供餐食")
     private Integer  mealsFlag;
 }

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -223,10 +223,10 @@ public class StoreInfoVo extends StoreInfo {
     private List<String> storeAlbumUrlList;
 
     @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
-    private String businessClassify;
+    private List<String> businessClassifyList;
 
     @ApiModelProperty(value = "分类名称")
-    private String businessClassifyName;
+    private List<String> businessClassifyNameList;
 
     @ApiModelProperty(value = "是否提供餐食")
     private Integer  mealsFlag;

alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -376,8 +376,10 @@ public class StoreInfoController {
     @ResponseBody
     public R getStoreCouponList(@RequestParam("storeId") String storeId) {
         log.info("StoreInfoController.getStoreDetail?storeId={},userId={}", storeId);
+        CouponAndEventVo couponAndEventVo = new CouponAndEventVo();
         List<LifeCouponVo> lifeCouponVos = storeInfoService.getStoreCouponList(storeId);
-        return R.data(lifeCouponVos);
+        couponAndEventVo.setCouponList(lifeCouponVos);
+        return R.data(couponAndEventVo);
     }
 
     @ApiOperation(value = "web端审批店铺")

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -883,7 +883,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
         storeInfo.setBusinessTypes(String.join(",", businessTypes));
         storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
-
+        
         //处理分类信息
         List<String> businessClassify = storeInfoDto.getBusinessClassify();
         if (!CollectionUtils.isEmpty(businessClassify)) {
@@ -914,7 +914,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
             storeInfo.setBusinessClassify(String.join(",", businessClassify));
             storeInfo.setBusinessClassifyName(String.join(",", businessClassifyNames));
         }
-
+        
         //处理一下行政区域信息
         EssentialCityCode essentialCityCode1 = essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionProvinceAdcode()));
         storeInfo.setAdministrativeRegionProvinceName(essentialCityCode1.getAreaName());
@@ -2266,7 +2266,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                 storeInfo.setBusinessTypes(String.join(",", businessTypes));
                 storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
             }
-
+            
             // 处理分类信息
             List<String> businessClassify = storeInfodto.getBusinessClassify();
             if (!CollectionUtils.isEmpty(businessClassify)) {