nnnn

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.cai.admin.init;
 
 
+import cn.dev33.satoken.annotation.SaCheckRole;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.cai.pay.PayOrderInfoDTO;
 import com.ruoyi.cai.pay.PayReturnResp;
@@ -24,12 +25,14 @@ public class CityController {
     private PayTrdConfigService payTrdConfigService;
 
     @GetMapping("/resetRedis")
+    @SaCheckRole("admin")
     public R<Void> resetRedis(){
         citysService.resetRedis();
         return R.ok();
     }
 
     @GetMapping("/resetOrder")
+    @SaCheckRole("admin")
     public R<JSONObject> resetOrder(String orderNo,String payType,boolean updateData){
         JSONObject jsonObject = payTrdConfigService.resetOrder(orderNo,payType,updateData);
         return R.ok(jsonObject);
@@ -37,12 +40,14 @@ public class CityController {
 
 
     @PostMapping("/createOrder")
+    @SaCheckRole("admin")
     public R<Object> createOrder(@RequestBody PayOrderInfoDTO dto){
         PayReturnResp orderAli = payTrdConfigService.createOrderAli(dto,false);
         return R.ok(orderAli);
     }
 
     @GetMapping("/queryOrder")
+    @SaCheckRole("admin")
     public R<JSONObject> queryOrder(String orderNo,String payType){
         JSONObject jsonObject = payTrdConfigService.queryOrder(orderNo,payType);
         return R.ok(jsonObject);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.cai.admin.init;
 
+import cn.dev33.satoken.annotation.SaCheckRole;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.User;
@@ -33,6 +34,7 @@ public class ImController {
     private UserService userService;
 
     @GetMapping("/register")
+    @SaCheckRole("admin")
     public R<Void> registerIm(Long userId){
         User user = userService.getById(userId);
         if(user == null){
@@ -66,6 +68,7 @@ public class ImController {
     }
 
     @GetMapping("/registerAll")
+    @SaCheckRole("admin")
     public R<Void> registerAllIm(){
         int current = 0;
         int success = 0;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.cai.admin.init;
 
+import cn.dev33.satoken.annotation.SaCheckRole;
 import com.ruoyi.cai.mq.AmqpHttpProducer;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ public class MqControllerTest {
     private AmqpHttpProducer amqpHttpProducer;
 
     @GetMapping("/send2")
+    @SaCheckRole("admin")
     public void send(String message){
         amqpHttpProducer.sendCalculateSales(message);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.cai.admin.op;
 
 
+import cn.dev33.satoken.annotation.SaCheckRole;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.job.op.BusOp;
@@ -26,6 +27,7 @@ public class BusOpController {
     private BusOp busOp;
 
     @GetMapping("/copySysLog")
+    @SaCheckRole("admin")
     public R<Void> copySysLog(int days){
         log.info("备份操作日志-开始");
         busOp.copySysLog(days);
@@ -34,6 +36,7 @@ public class BusOpController {
     }
 
     @GetMapping("/deleteUserCall")
+    @SaCheckRole("admin")
     public R<Void> deleteUserCall(){
         log.info("清洗垃圾通话记录-开始");
         busOp.deleteUserCall(16);
@@ -43,12 +46,14 @@ public class BusOpController {
 
 
     @GetMapping("/refreshUserVipStatus")
+    @SaCheckRole("admin")
     public R<Void> refreshUserVipStatus(){
         busOp.refreshUserVipStatus();
         return R.ok();
     }
 
     @GetMapping("/checkVipOrder")
+    @SaCheckRole("admin")
     public R<Void> checkVipOrder(String orderNo,String startTimeStr,String endTimeStr){
         LocalDateTime startTime = null;
         LocalDateTime endTime = null;
@@ -63,6 +68,7 @@ public class BusOpController {
     }
 
     @GetMapping("/checkRechargeOrder")
+    @SaCheckRole("admin")
     public R<Void> checkRechargeOrder(String orderNo,String startTimeStr,String endTimeStr){
         LocalDateTime startTime = null;
         LocalDateTime endTime = null;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.cai.admin.op;
 
+import cn.dev33.satoken.annotation.SaCheckRole;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.job.op.ImOp;
@@ -30,6 +31,7 @@ public class ImOpController {
     private ImUserRefClient imUserRefClient;
 
     @GetMapping("/getImInfo")
+    @SaCheckRole("admin")
     public R<YxUpdateUinfoR> getImInfo(String id) {
         GetUnifoReq getUnifoReq = new GetUnifoReq();
         String[] split = id.split(",");
@@ -40,24 +42,28 @@ public class ImOpController {
 
 
     @GetMapping("/refreshIm")
+    @SaCheckRole("admin")
     public R<Void> list() {
         imOp.refreshIm();
         return R.ok();
     }
 
     @GetMapping("/refreshImUserInfo")
+    @SaCheckRole("admin")
     public R<Void> refreshImUserInfo(){
         imOp.refreshImUserInfo();
         return R.ok();
     }
 
     @GetMapping("/refreshImByUser")
+    @SaCheckRole("admin")
     public R<Void> refreshImByUser(String usercode){
         imOp.refreshImToken(usercode);
         return R.ok();
     }
 
     @GetMapping("/refreshImNoSaveToken")
+    @SaCheckRole("admin")
     public R<Void> refreshImNoSaveToken(){
         imOp.refreshImNoSaveToken();
         return R.ok();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/RefreshOpController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.cai.admin.op;
 
 
+import cn.dev33.satoken.annotation.SaCheckRole;
 import com.ruoyi.cai.kit.ShareUrlKit;
 import com.ruoyi.cai.service.RankService;
 import com.ruoyi.common.core.domain.R;
@@ -29,12 +30,14 @@ public class RefreshOpController {
     private ShareUrlKit shareUrlKit;
 
     @GetMapping("/cleanShareUrlCacheByUsercode")
+    @SaCheckRole("admin")
     public R<Void> cleanShareUrlCacheByUsercode(String usercode){
         shareUrlKit.cleanShareUrlCacheByUsercode(usercode);
         return R.ok();
     }
 
     @GetMapping("/cleanShareUrlCache")
+    @SaCheckRole("admin")
     public R<Void> cleanShareUrlCache(){
         shareUrlKit.cleanShareUrlCache();
         return R.ok();
@@ -42,6 +45,7 @@ public class RefreshOpController {
 
 
     @GetMapping("/day")
+    @SaCheckRole("admin")
     public R<Void> day(String date,Integer type) {
         LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         rankService.saveDayRank(localDate, type);
@@ -49,6 +53,7 @@ public class RefreshOpController {
     }
 
     @GetMapping("/week")
+    @SaCheckRole("admin")
     public R<Void> week(String date,Integer type){
         LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         rankService.saveWeekRank(localDate,type);
@@ -56,6 +61,7 @@ public class RefreshOpController {
     }
 
     @GetMapping("/month")
+    @SaCheckRole("admin")
     public R<Void> month(String date,Integer type){
         LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         rankService.saveMonthRank(localDate,type);

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.cai.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Union;
@@ -57,6 +58,7 @@ public class UnionTotalController extends BaseController {
 
     @Log(title = "刷新工会每日收益", businessType = BusinessType.DELETE)
     @GetMapping("/refreshData")
+    @SaCheckRole("admin")
     public R<Void> refreshData(String date) {
         if(StringUtils.isBlank(date)){
             unionTotalService.refreshAll();
@@ -69,6 +71,7 @@ public class UnionTotalController extends BaseController {
 
     @Log(title = "刷新所有工会总收益")
     @GetMapping("/refreshAllUnion")
+    @SaCheckRole("admin")
     public R<Void> refreshAllUnion() {
         unionTotalService.refreshUnionTotalAll();
         return R.ok();
@@ -76,6 +79,7 @@ public class UnionTotalController extends BaseController {
 
     @Log(title = "刷新指定工会总收益")
     @GetMapping("/refreshUnionTotal")
+    @SaCheckRole("admin")
     public R<Void> refreshUnionTotal(Long unionId) {
         unionTotalService.refreshUnionTotal(unionId);
         return R.ok();

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ProxyUserManager.java

@@ -27,7 +27,7 @@ public class ProxyUserManager {
 
     public IPage<OrderListDTO> orderLogList(String usercode,PageQuery pageQuery, OrderListDTO query){
         User user = getUser(usercode);
-        return consumeLogMapper.selectProxyUserOrderPage(pageQuery.build(),user.getUsercode(), query);
+        return consumeLogMapper.selectProxyUserOrderPage(pageQuery.build(),user.getId(), query);
     }
 
     public IPage<BindUserListDTO> bindUserList(String userCode, PageQuery pageQuery, BindUserListDTO query) {
@@ -37,7 +37,7 @@ public class ProxyUserManager {
 
     public ProxyTotalDTO total(String userCode) {
         User user = getUser(userCode);
-        BigDecimal priceSum = consumeLogMapper.sumProxyUserOrder(user.getUsercode());
+        BigDecimal priceSum = consumeLogMapper.sumProxyUserOrder(user.getId());
         Long userCount = userInviteMapper.countProxyBindUser(user.getId());
         ProxyTotalDTO proxyTotalDTO = new ProxyTotalDTO();
         proxyTotalDTO.setBindUserCount(userCount == null ? 0 : userCount);

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java

@@ -16,8 +16,8 @@ import java.math.BigDecimal;
  */
 public interface ConsumeLogMapper extends BaseMapper<ConsumeLog> {
     IPage<OrderListDTO> selectProxyUserOrderPage(@Param("page") IPage<OrderListDTO> page,
-                                                 @Param("proxyUserCode") String proxyUserCode,
+                                                 @Param("proxyUserId") Long proxyUserId,
                                                  @Param("query") OrderListDTO query);
 
-    BigDecimal sumProxyUserOrder(@Param("userCode") String userCode);
+    BigDecimal sumProxyUserOrder(@Param("userId") Long userId);
 }

ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from cai_consume_log t1
         join cai_recharge_order t2 on t1.trace_id = t2.trace_id
         left join cai_user t3 on t2.user_id = t3.id
-        where t1.type = 1 and t1.one_user_id = #{proxyUserCode} and t1.`status` = 1
+        where t1.type = 1 and t1.one_user_id = #{proxyUserId} and t1.`status` = 1
         <if test="query.usercode != null and query.usercode != ''">
             and t3.usercode = #{query.usercode}
         </if>
@@ -31,6 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sum(t2.price)
         from cai_consume_log t1
         join cai_recharge_order t2 on t1.trace_id = t2.trace_id
-        where t1.type = 1 and t1.one_user_id = #{userCode} and t1.`status` = 1
+        where t1.type = 1 and t1.one_user_id = #{userId} and t1.`status` = 1
     </select>
 </mapper>