fix 统计appleOne退款;注解验权

netflix-dao/src/main/resources/mapper/CmsUserMapper.xml

@@ -10,6 +10,6 @@
                  inner join `cms_user_role` ur on u.id = ur.user_id
                  inner join `cms_role` r on r.id = ur.role_id
         where u.id = #{userId}
-        group by r.id
+        group by u.id
     </select>
 </mapper>

netflix-service/src/main/java/com/cyksj/service/mange/cms/CmsUserManager.java

@@ -99,7 +99,7 @@ public class CmsUserManager {
 	}
 
 	public void saveUserRoleRelation(Long userId, String roleIds) {
-		Arrays.stream(roleIds.split(",")).forEach(roleId->{
+		Arrays.stream(roleIds.split(",")).collect(Collectors.toSet()).forEach(roleId->{
 			cmsUserRoleMapper.insert(new CmsUserRole(userId, Long.valueOf(roleId)));
 		});
 	}

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -243,6 +243,9 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 			}).collect(Collectors.toList());
 			backgroundDataView.setAppleOneDataViews(collect);
 		} else {
+			appleOneData.forEach(data->{
+				data.setRefundMoney(getAppleOneRefundMoneyByArea(data.getAreaName(), startDate, endDate));
+			});
 			backgroundDataView.setAppleOneDataViews(appleOneData);
 		}
 	}

netflix-web/src/main/java/com/cyksj/config/SaTokenConfigure.java

@@ -1,37 +1,40 @@
-//package com.cyksj.config;
-//
-//import cn.dev33.satoken.interceptor.SaRouteInterceptor;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-//
-//import java.util.List;
-//
-///*
-// *项目名: yicang-admin
-// *文件名: SaTokenConfigure
-// *创建者: JavaZou
-// *创建时间:2022/12/19 10:01
-// */
-//@Configuration
-//public class SaTokenConfigure implements WebMvcConfigurer {
-//	// 注册拦截器
-//	@Override
-//	public void addInterceptors(InterceptorRegistry registry) {
-//		registry.addInterceptor(new SaRouteInterceptor())
-//				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
-//				.excludePathPatterns(List.of("/manage/admin/login",
-//						"/manage/admin/get/loginInfo",
-//						"/manage/corp/**",
-//						"/manage/coupon/corp/send",
-//						"/manage/coupon",
-//						"/manage/register/wx/refund/notify",
-//						"/manage/register/unLimit",
-//						"/manage/gzh/msg/notify",
-//						"/manage/admin/send/template",
-//						"/manage/order/put/status/*",
-//						"/manage/user/get/loginInfo",
-//						"/manage/user/login"));
-//	}
-//}
-//
+package com.cyksj.config;
+
+import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
+import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+/*
+ *项目名: yicang-admin
+ *文件名: SaTokenConfigure
+ *创建者: JavaZou
+ *创建时间:2022/12/19 10:01
+ */
+@Configuration
+public class SaTokenConfigure implements WebMvcConfigurer {
+	// 注册拦截器
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+		registry.addInterceptor(new SaRouteInterceptor())
+				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
+				.excludePathPatterns(List.of("/manage/admin/login",
+						"/manage/admin/get/loginInfo",
+						"/manage/corp/**",
+						"/manage/coupon/corp/send",
+						"/manage/coupon",
+						"/manage/register/wx/refund/notify",
+						"/manage/register/unLimit",
+						"/manage/gzh/msg/notify",
+						"/manage/admin/send/template",
+						"/manage/order/put/status/*",
+						"/manage/user/get/loginInfo",
+						"/manage/user/login"));
+		//注解权限校验
+		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
+	}
+}
+

netflix-web/src/main/java/com/cyksj/web/GlobalExceptionHandler.java

@@ -1,6 +1,8 @@
 package com.cyksj.web;
 
 import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.exception.NotPermissionException;
+import cn.dev33.satoken.exception.NotRoleException;
 import cn.hutool.core.lang.Validator;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.StringUtil;
@@ -73,6 +75,14 @@ public class GlobalExceptionHandler {
             } else {
                 apiCode = GatewayApiCode.CMS_USER_NO_LOGIN;
             }
+        } else if (e instanceof NotRoleException) {
+            // 如果是角色异常
+            NotRoleException ee = (NotRoleException) e;
+            apiCode = GatewayApiCode.CMS_USER_NO_ROLE;
+        } else if (e instanceof NotPermissionException) {
+            // 如果是权限异常
+            NotPermissionException ee = (NotPermissionException) e;
+            apiCode = GatewayApiCode.CMS_USER_NO_PERMISSION;
         }
         log.error("全局错误处理: \n Cause: {} \n Value: {}", message, value);
         if (apiCode != null) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/cms/CmsAdminUserController.java

@@ -136,6 +136,8 @@ public class CmsAdminUserController {
 		//删除用户角色关联关系、缓存
 		cmsUserManager.delUserRoleRelation(exist);
 		cmsUserMapper.deleteById(id);
+		//删除用户,将上线的用户踢下
+		StpUtil.logoutByLoginId(id);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("删除成功");
 	}