接口修改

ruoyi-admin/src/main/java/com/ruoyi/api/controller/clock/ApiClockRecordController.java

@@ -16,6 +16,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.common.filepathsplicing.FilePathSplicingType;
 import io.swagger.annotations.Api;
@@ -127,8 +128,11 @@ public class ApiClockRecordController extends AbstractApiController {
     @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @PostMapping("/submit")
     public R<Long> submitClock(@Validated(AddGroup.class) @RequestBody ClockRecordBo bo) {
-        Long employeeId = getUserId();
-        return R.ok(iClockRecordService.submitClock(bo, employeeId));
+        Employee loginUser = getLoginUser();
+        if(ObjectUtil.isNull(loginUser)){
+            throw new ServiceException("用户不存在");
+        }
+        return R.ok(iClockRecordService.submitClock(bo, loginUser.getEmployeeId()));
     }
 
     /**

ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfiguration.java

@@ -20,7 +20,7 @@ public class InterceptorConfiguration implements WebMvcConfigurer {
         registry.addInterceptor(loginApiInterceptor)
                 .addPathPatterns("/api/**")
                 //放行的接口
-                .excludePathPatterns("/**/login", "/**/ad/info/**","/**/activity/**","/**/clockRecord/**");
+                .excludePathPatterns("/**/login", "/**/ad/info/**","/**/activity/**","/**/clockRecord/saleRankList");
 
     }
 

ruoyi-system/src/main/java/com/ruoyi/clock/domain/bo/ActivityShopSaleBo.java

@@ -23,6 +23,9 @@ public class ActivityShopSaleBo {
     @NotNull(message = "活动id不能为空", groups = {QueryGroup.class})
     private Long activityId;
 
+    @NotNull(message = "代理商id不能为空", groups = {QueryGroup.class})
+    private Long agentId;
+
     /**
      * 代理商名称（模糊查询）
      */

ruoyi-system/src/main/resources/mapper/clock/ClockRecordMapper.xml

@@ -234,8 +234,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_shop s        ON e.shop_id = s.shop_id
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
         LEFT JOIN tb_activity_product ap ON r.activity_id = ap.activity_id
+        LEFT JOIN tb_activity_agent aa ON r.activity_id = aa.activity_id
         WHERE r.activity_id = #{bo.activityId}
           AND r.status = 0
+        <if test="bo.agentId != null ">
+            AND aa.agent_id = #{bo.agentId}
+        </if>
         <if test="bo.agentName != null and bo.agentName != ''">
             AND ag.agent_name LIKE CONCAT('%', #{bo.agentName}, '%')
         </if>