浏览代码

feat:添加入驻营业执照相关信息存入

penghao 1 周之前
父节点
当前提交
ffe1565e8e

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

@@ -213,8 +213,17 @@ public class StoreInfoDto {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entertainmentLicenceExpirationTime;
     private Date entertainmentLicenceExpirationTime;
 
 
-//    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
-//    @JsonDeserialize(using = StringToListDeserializer.class)
-//    private List<String> businessClassify;
+    @ApiModelProperty(value = "营业执照图片URL")
+    private String businessLicenseUrl;
 
 
+    @ApiModelProperty(value = "营业执照状态 字典 foodLicenceStatus")
+    private Integer businessLicenseStatus;
+
+    @ApiModelProperty(value = "营业执照失败原因")
+    private String businessLicenseReason;
+
+    @ApiModelProperty(value = "营业执照到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date businessLicenseExpirationTime;
 }
 }

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

@@ -1051,7 +1051,6 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         if (storeInfo.getBusinessLicenseExpirationTime() != null) {
         if (storeInfo.getBusinessLicenseExpirationTime() != null) {
             expirationTimeList.add(storeInfo.getBusinessLicenseExpirationTime());
             expirationTimeList.add(storeInfo.getBusinessLicenseExpirationTime());
         }
         }
-        // 注意:身份证过期时间在saveIdCardImages方法中设置,这里先不包含,后续会在saveIdCardImages后更新
         // 取最小值设置为门店到期时间
         // 取最小值设置为门店到期时间
         if (!expirationTimeList.isEmpty()) {
         if (!expirationTimeList.isEmpty()) {
             Date minExpirationTime = Collections.min(expirationTimeList);
             Date minExpirationTime = Collections.min(expirationTimeList);
@@ -3439,7 +3438,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                     store.setDistance(storeDistance);
                     store.setDistance(storeDistance);
                     // 使用反射或扩展字段存储finalScore,这里我们使用一个临时字段
                     // 使用反射或扩展字段存储finalScore,这里我们使用一个临时字段
                     // 由于StoreInfoVo没有finalScore字段,我们使用distance字段临时存储,排序后再恢复
                     // 由于StoreInfoVo没有finalScore字段,我们使用distance字段临时存储,排序后再恢复
-                    return new Object[]{store, finalScore};
+                    return new Object[] { store, finalScore };
                 })
                 })
                 .filter(item -> {
                 .filter(item -> {
                     // 距离优先模式:过滤掉超出范围的
                     // 距离优先模式:过滤掉超出范围的