Ver código fonte

修改案例列表详情

zhangchen 2 meses atrás
pai
commit
ed7f1941ca

+ 2 - 0
alien-entity/src/main/java/shop/alien/mapper/storePlantform/StoreOperationalActivityAchievementMapper.java

@@ -24,11 +24,13 @@ public interface StoreOperationalActivityAchievementMapper extends BaseMapper<St
      * 分页查询案例列表(同一用户同一活动最新成果)。
      *
      * @param page           分页
+     * @param storeId        店铺ID(必填)
      * @param activityStatus 活动状态
      * @return 分页列表
      */
     IPage<StoreOperationalActivityAchievementCaseVo> selectCasePage(
             IPage<?> page,
+            @Param("storeId") Integer storeId,
             @Param("activityStatus") Integer activityStatus);
 
     /**

+ 1 - 0
alien-entity/src/main/resources/mapper/storePlatform/StoreOperationalActivityAchievementMapper.xml

@@ -44,6 +44,7 @@
             AND su.delete_flag = 0
         WHERE ach.delete_flag = 0
           AND act.delete_flag = 0
+          AND act.store_id = #{storeId}
         <if test="activityStatus != null">
             <if test="activityStatus == 5">
                 AND act.status IN (4, 5)

+ 7 - 3
alien-store/src/main/java/shop/alien/store/controller/StoreOperationalActivityController.java

@@ -187,21 +187,25 @@ public class StoreOperationalActivityController {
     @ApiOperation("案例列表")
     @ApiOperationSupport(order = 7)
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "storeId", value = "店铺ID", dataTypeClass = Integer.class, paramType = "query", required = true),
             @ApiImplicitParam(name = "activityStatus", value = "活动状态", dataTypeClass = Integer.class, paramType = "query"),
             @ApiImplicitParam(name = "pageNum", value = "当前页", dataTypeClass = Integer.class, paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", dataTypeClass = Integer.class, paramType = "query")
     })
     @GetMapping("/achievement/case/list")
     public R<IPage<StoreOperationalActivityAchievementCaseVo>> listCasePage(
+            @RequestParam("storeId") Integer storeId,
             @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
             @RequestParam(value = "pageNum", required = false) Integer pageNum,
             @RequestParam(value = "pageSize", required = false) Integer pageSize) {
-        log.info("StoreOperationalActivityController.listCasePage activityStatus={}, pageNum={}, pageSize={}",
-                activityStatus, pageNum, pageSize);
+        log.info("StoreOperationalActivityController.listCasePage storeId={}, activityStatus={}, pageNum={}, pageSize={}",
+                storeId, activityStatus, pageNum, pageSize);
         try {
             IPage<StoreOperationalActivityAchievementCaseVo> result =
-                    achievementService.listCasePage(activityStatus, pageNum, pageSize);
+                    achievementService.listCasePage(storeId, activityStatus, pageNum, pageSize);
             return R.data(result);
+        } catch (IllegalArgumentException e) {
+            return R.fail(e.getMessage());
         } catch (Exception e) {
             log.error("StoreOperationalActivityController.listCasePage ERROR: {}", e.getMessage(), e);
             return R.fail(e.getMessage());

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreOperationalActivityAchievementService.java

@@ -51,7 +51,7 @@ public interface StoreOperationalActivityAchievementService {
      * @param pageSize 每页条数
      * @return 分页列表
      */
-    IPage<StoreOperationalActivityAchievementCaseVo> listCasePage(Integer activityStatus, Integer pageNum, Integer pageSize);
+    IPage<StoreOperationalActivityAchievementCaseVo> listCasePage(Integer storeId, Integer activityStatus, Integer pageNum, Integer pageSize);
 
     /**
      * 案例详情

+ 5 - 2
alien-store/src/main/java/shop/alien/store/service/impl/StoreOperationalActivityAchievementServiceImpl.java

@@ -127,11 +127,14 @@ public class StoreOperationalActivityAchievementServiceImpl implements StoreOper
     }
 
     @Override
-    public IPage<StoreOperationalActivityAchievementCaseVo> listCasePage(Integer activityStatus, Integer pageNum, Integer pageSize) {
+    public IPage<StoreOperationalActivityAchievementCaseVo> listCasePage(Integer storeId, Integer activityStatus, Integer pageNum, Integer pageSize) {
+        if (storeId == null) {
+            throw new IllegalArgumentException("店铺ID不能为空");
+        }
         int current = pageNum == null || pageNum <= 0 ? 1 : pageNum;
         int size = pageSize == null || pageSize <= 0 ? 10 : pageSize;
         Page<StoreOperationalActivityAchievementCaseVo> page = new Page<>(current, size);
-        return achievementMapper.selectCasePage(page, activityStatus);
+        return achievementMapper.selectCasePage(page, storeId, activityStatus);
     }
 
     @Override