合并代码到sit

alien-entity/src/main/java/shop/alien/entity/store/StoreInfo.java

@@ -235,7 +235,7 @@ public class StoreInfo {
     @TableField("update_renew_contract_time")
     private Date  updateRenewContractTime;
 
-    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)")
+    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
     @TableField("business_classify")
     private String businessClassify;
 
@@ -243,9 +243,9 @@ public class StoreInfo {
     @TableField("business_classify_name")
     private String businessClassifyName;
 
-    @ApiModelProperty(value = "是否提供餐食 0 否 1 是")
-    @TableField("meal_provided")
-    private Integer mealProvided;
+    @ApiModelProperty(value = "是否提供餐食")
+    @TableField("meals_flag")
+    private Integer  mealsFlag;
 
     @ApiModelProperty(value = "娱乐经营许可证状态 字典 foodLicenceStatus")
     @TableField("entertainment_licence_status")
@@ -257,7 +257,7 @@ public class StoreInfo {
 
     @ApiModelProperty(value = "娱乐经营许可证到期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField("entertainment_licence_expiration_time")
+    @TableField("entertainment_licence__expiration_time")
     private Date entertainmentLicenceExpirationTime;
 
     @ApiModelProperty(value = "变更娱乐经营许可证提交时间")

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

@@ -180,20 +180,26 @@ public class StoreInfoDto {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date foodLicenceExpirationTime;
 
-    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)")
-    private  List<String> businessClassifyList;
+    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
+    private List<String> businessClassify;
 
     @ApiModelProperty(value = "分类名称")
     private String businessClassifyName;
 
+    @ApiModelProperty(value = "是否提供餐食")
+    private Integer  mealsFlag;
 
-    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
-    private List<String> businessClassify;
+    @ApiModelProperty(value = "娱乐经营许可证图片地址")
+    private String entertainmentLicenceUrl;
 
-    @ApiModelProperty(value = "是否提供餐食 0=不提供  1=提供")
-    @TableField("meal_provided")
-    private Integer mealProvided;
+    @ApiModelProperty(value = "娱乐经营许可证状态")
+    private Integer entertainmentLicenceStatus;
 
-    @ApiModelProperty(value = "娱乐经营许可证")
-    private List<String> entertainmentLicenseAddress;
+    @ApiModelProperty(value = "娱乐经营许可证原因")
+    private String entertainmentLicenceReason;
+
+    @ApiModelProperty(value = "娱乐经营许可证到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date entertainmentLicenceExpirationTime;
 }

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

@@ -874,6 +874,16 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                 storeImg.setImgUrl(storeInfoDto.getFoodLicenceUrl());
                 storeImgMapper.insert(storeImg);
         }
+        //存入店铺娱乐经营许可证图片
+        if (StringUtils.isNotEmpty(storeInfoDto.getEntertainmentLicenceUrl())) {
+            StoreImg storeImg = new StoreImg();
+            storeImg.setStoreId(storeInfo.getId());
+            storeImg.setImgType(26);
+            storeImg.setImgSort(0);
+            storeImg.setImgDescription("娱乐经营许可证审核通过图片");
+            storeImg.setImgUrl(storeInfoDto.getEntertainmentLicenceUrl());
+            storeImgMapper.insert(storeImg);
+        }
 
         //初始化标签数据
         LambdaQueryWrapper<TagStoreRelation> tagStoreRelationLambdaQueryWrapper = new LambdaQueryWrapper<>();