加盟优化

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -20,6 +20,7 @@ import com.mmc.iuav.user.service.UserAccountService;
 import com.mmc.iuav.user.util.SmsUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -250,6 +251,12 @@ public class CooperationServiceImpl implements CooperationService {
         if (!userApplyTag.getApplyStatus().equals(1)) {
             return ResultBody.error("当前服务商暂未通过审核！");
         }
+        if (StringUtils.isBlank(applyTagEditVO.getRemark())) {
+            UserApplyTagDO userApplyTagDO = new UserApplyTagDO();
+            userApplyTagDO.setId(applyTagEditVO.getId());
+            userApplyTagDO.setRemark(applyTagEditVO.getRemark());
+            cooperationDao.updateUserApplyTag(userApplyTagDO);
+        }
         if (!CollectionUtils.isEmpty(applyTagEditVO.getAttachmentList())) {
             cooperationDao.deleteApplyResource(applyTagEditVO.getId());
             cooperationDao.insertApplyResource(applyTagEditVO.getAttachmentList());

csm-service/cms-service-user/src/main/resources/mapper/CooperationDao.xml

@@ -289,7 +289,7 @@
         FROM
             user_apply_tag uat
             INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
-        WHERE ct.id = #{type}
+        WHERE ct.id = #{type} and uat.is_deleted = 0
     </select>
     <select id="listServiceBitmapData" resultType="com.mmc.iuav.user.entity.WebsiteInfoDO">
         SELECT
@@ -307,7 +307,7 @@
             INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
             INNER JOIN company_member cm ON cm.user_account_id = uat.user_account_id
             INNER JOIN company_info ci ON cm.company_info_id = ci.id
-        WHERE ct.id = #{type}
+        WHERE ct.id = #{type} and uat.is_deleted = 0
         ORDER BY distance ASC
             LIMIT #{pageNo}, #{pageSize}
     </select>