加盟审批bug修复及Redis链接本地配置

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CooperationController.java

@@ -82,7 +82,7 @@ public class CooperationController extends BaseController {
   @GetMapping("approvalApplyTag")
   public ResultBody approvalApplyTag(
       @RequestParam(value = "id") Integer id, @RequestParam(value = "status") Boolean status) {
-    return ResultBody.success(cooperationService.approvalApplyTag(id, status));
+    return cooperationService.approvalApplyTag(id, status);
   }
 
   @ApiOperation(value = "后台设置小程序用户标签")

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

@@ -127,6 +127,7 @@ public class CooperationServiceImpl implements CooperationService {
     return ResultBody.success(userApplyTagDetailsVO);
   }
 
+  @Transactional
   @Override
   public ResultBody approvalApplyTag(Integer id, Boolean status) {
     // 判断用户是否已经是该渠道
@@ -134,18 +135,17 @@ public class CooperationServiceImpl implements CooperationService {
     int count =
         cooperationDao.userTagInfo(
             userApplyTag.getCooperationTagId(), userApplyTag.getUserAccountId());
-    if (count == 0) {
-      if (status) {
-        cooperationDao.updateApplyTagStatus(id, 1);
+    if (status){
+      cooperationDao.updateApplyTagStatus(id, 1);
+      if (count == 0){
         // 审批通过往用户标签表中新增一条数据
         UserTagDO userTagDO = new UserTagDO();
         userTagDO.setUserAccountId(userApplyTag.getUserAccountId());
         userTagDO.setCooperationTagId(userApplyTag.getCooperationTagId());
         cooperationDao.insertUserTag(userTagDO);
-      } else {
-        cooperationDao.updateApplyTagStatus(id, 2);
       }
-      return ResultBody.success();
+    }else {
+      cooperationDao.updateApplyTagStatus(id, 2);
     }
     return ResultBody.success();
   }

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -10,8 +10,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
     database: 1
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
-    password: MMC@2022&REDIS
+    host: 127.0.0.1
     port: 6379
   #rabbitMQ
   rabbitmq: