bugfix:3098ai工具台待审核状态

alien-entity/src/main/java/shop/alien/mapper/StoreImgMapper.java

@@ -1,17 +1,17 @@
 package shop.alien.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import shop.alien.entity.store.StoreImg;
-import shop.alien.entity.store.vo.StoreDynamicDiscountInviteLogVo;
 import shop.alien.entity.store.vo.StoreImgTypeVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 门店图片 Mapper 接口
@@ -81,4 +81,15 @@ public interface StoreImgMapper extends BaseMapper<StoreImg> {
                                                    @Param("imgType") Integer imgType,
                                                    @Param("albumIds") List<Integer> albumIds);
 
+    @Select("SELECT * FROM store_img ${ew.customSqlSegment}")
+    StoreImg selectDeleImg(@Param(Constants.WRAPPER) LambdaQueryWrapper<StoreImg> storeImgLambdaQueryWrapper);
+
+    /**
+     * 更新删除状态
+     *
+     * @param set 更新条件
+     * @return 更新行数
+     */
+    @Update("UPDATE store_img SET delete_flag = 0 WHERE id = #{id}")
+    int updateDelete(@Param("id") String id );
 }

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

@@ -297,9 +297,10 @@ public class LicenseAuditAsyncService {
                     log.info("{}AI审核拒绝，门店ID：{}，图片URL：{}，拒绝原因：{}", licenseTypeName, storeId, imageUrl, rejectReason);
                     storeInfoMapper.update(null, new LambdaUpdateWrapper<StoreInfo>()
                             .eq(StoreInfo::getId, storeId)
-                            .set(StoreInfo::getBusinessLicenseStatus, 2)
+                            .set(StoreInfo::getBusinessLicenseStatus, 3)
+                            .set(StoreInfo::getBusinessLicenseReason, rejectReason)
                     );
-                    // 审核拒绝时，删除store_img表中的记录（逻辑删除），避免前端展示审核拒绝的图片
+                    // 审核拒绝时，删除store_img表中的记录（逻辑删除），避免前端展示审核拒绝的图片 ->之前都没插入。。。应该没用这段
                     LambdaUpdateWrapper<StoreImg> deleteImgWrapper = new LambdaUpdateWrapper<>();
                     deleteImgWrapper.eq(StoreImg::getStoreId, storeId)
                             .eq(StoreImg::getImgType, 14) // 营业执照对应14
@@ -307,6 +308,19 @@ public class LicenseAuditAsyncService {
                             .eq(StoreImg::getDeleteFlag, 0)
                             .set(StoreImg::getDeleteFlag, 1);
                     storeImgMapper.update(null, deleteImgWrapper);
+                    // 查询最新的type=14的记录，更新imgSort
+                    StoreImg latestImg = storeImgMapper.selectDeleImg(
+                            new LambdaQueryWrapper<StoreImg>()
+                                    .eq(StoreImg::getStoreId, storeId)
+                                    .eq(StoreImg::getImgType, 14)
+                                    .eq(StoreImg::getDeleteFlag, 1)
+                                    .last("limit 1")
+                                    .orderByDesc(StoreImg::getId)
+                    );
+                    if (latestImg != null) {
+                        int update = storeImgMapper.updateDelete(String.valueOf(latestImg.getId()));
+                        log.info("{}AI审核拒绝，已更新store_img记录，门店ID：{}，图片URL：{}，更新记录数：{}", licenseTypeName, storeId, imageUrl, update);
+                    }
                     log.info("{}AI审核拒绝，已删除store_img记录，门店ID：{}，图片URL：{}", licenseTypeName, storeId, imageUrl);
                 } else if (needApprove) {
                     // 审核通过

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

@@ -105,10 +105,10 @@ public class LifeBlacklistServiceImpl extends ServiceImpl<LifeBlacklistMapper, L
             if (lifeBlacklist.getBlockedId() != null && lifeBlacklist.getBlockedType() != null) {
                 if ("1".equals(lifeBlacklist.getBlockedType())) {
                     StoreUser storeUser = storeUserMapper.selectById(lifeBlacklist.getBlockedId());
-                    StoreInfo storeInfo = storeInfoMapper.selectById(storeUser.getStoreId());
-                    lifeBlacklist.setStoreInfo(storeInfo);
-                    StoreImg storeImg = null;
-                    if (storeUser != null) {
+                    if(storeUser != null) {
+                        StoreInfo storeInfo = storeInfoMapper.selectById(storeUser.getStoreId());
+                        lifeBlacklist.setStoreInfo(storeInfo);
+                        StoreImg storeImg = null;
                         lifeBlacklist.setName(storeUser.getName());
                         lifeBlacklist.setPhoneId(storeUser.getPhone());
                         lifeBlacklist.setUserImage(storeUser.getHeadImg());