添加查询消费者的签到记录及获取所有的店铺

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/socialstatuschangelog/SocialStatusChangeLogController.java

@@ -91,4 +91,11 @@ public class SocialStatusChangeLogController {
                         BeanUtils.toBean(list, SocialStatusChangeLogRespVO.class));
     }
 
+    @GetMapping("/getUserSignLog")
+    @Operation(summary = "获得会员身价变化日志分页")
+    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:create')")
+    public CommonResult<PageResult<UserSignSocialLogRespVO>> getUserSignLog(@Valid SocialStatusChangeLogPageReqVO pageReqVO) {
+        return success(socialStatusChangeLogService.getUserSignLog(pageReqVO));
+    }
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/socialstatuschangelog/vo/UserSignSocialLogRespVO.java

@@ -0,0 +1,23 @@
+package cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 会员签到身价变化日志分页 Request VO")
+@Data
+public class UserSignSocialLogRespVO {
+    @Schema(description = "编号", example = "8042")
+    private Long id;
+
+    @Schema(description = "身价点数在本类别操作的变化值")
+    private Long variationValue;
+
+    @Schema(description = "操作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/socialstatuschangelog/SocialStatusChangeLogMapper.java

@@ -5,9 +5,11 @@ import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
 import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog.SocialStatusChangeLogDO;
+import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo.*;
 
+
 /**
  * 会员身价变化日志 Mapper
  *
@@ -30,4 +32,10 @@ public interface SocialStatusChangeLogMapper extends BaseMapperX<SocialStatusCha
                 .orderByDesc(SocialStatusChangeLogDO::getId));
     }
 
+     default PageResult<SocialStatusChangeLogDO> getUserSignLog(SocialStatusChangeLogPageReqVO pageReqVO){
+        return selectPage(pageReqVO ,new LambdaQueryWrapperX<SocialStatusChangeLogDO>()
+                .eq(SocialStatusChangeLogDO::getUserId, pageReqVO.getUserId())
+                .eq(SocialStatusChangeLogDO::getSocialStatusChangeCategoryId, SocialStatusEnum.SIGN_IN_SOCIAL.getStatus())
+        );
+     }
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/socialstatuschangelog/SocialStatusChangeLogService.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.distri.service.socialstatuschangelog;
 
 import javax.validation.*;
+
 import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog.SocialStatusChangeLogDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
@@ -63,4 +64,5 @@ public interface SocialStatusChangeLogService {
      */
     PageResult<SocialStatusChangeLogDO> getSocialStatusChangeLogPage(SocialStatusChangeLogPageReqVO pageReqVO);
 
+    PageResult<UserSignSocialLogRespVO> getUserSignLog(SocialStatusChangeLogPageReqVO pageReqVO);
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/socialstatuschangelog/SocialStatusChangeLogServiceImpl.java

@@ -87,4 +87,10 @@ public class SocialStatusChangeLogServiceImpl implements SocialStatusChangeLogSe
         return socialStatusChangeLogMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<UserSignSocialLogRespVO> getUserSignLog(SocialStatusChangeLogPageReqVO pageReqVO) {
+        PageResult<SocialStatusChangeLogDO> userSignLog = socialStatusChangeLogMapper.getUserSignLog(pageReqVO);
+        return BeanUtils.toBean(userSignLog, UserSignSocialLogRespVO.class);
+    }
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/ShopController.java

@@ -5,7 +5,6 @@ import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopPageReqVO;
 import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopRespVO;
 import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopSaveReqVO;
 import cn.newfeifan.mall.sale.dal.redis.ShopMessage;
-import cn.newfeifan.mall.sale.service.merchant.MerchantService;
 import cn.newfeifan.mall.sale.service.shop.ShopService;
 import org.springframework.web.bind.annotation.*;
 
@@ -183,4 +182,10 @@ public class ShopController {
         return success(ids);
     }
 
+    @GetMapping("/get-All-Shop")
+    @Operation(summary = "获取所有的用户")
+    @PreAuthorize("@ss.hasPermission('sale:merchant:query')")
+    public CommonResult<List<UserRespVO>> getAllUser() {
+        return success(shopService.selectAllList());
+    }
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shop/ShopService.java

@@ -104,4 +104,6 @@ public interface ShopService {
     List<ShopRespVO> getAllShopByUserId(Long loginUserId);
 
     List<Long> getShopByName(String shopName);
+
+    List<UserRespVO> selectAllList();
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shop/ShopServiceImpl.java

@@ -172,4 +172,10 @@ public class ShopServiceImpl implements ShopService {
         return shopMapper.selectShopIds(shopName);
     }
 
+    @Override
+    public List<UserRespVO> selectAllList() {
+        List<ShopDO> shopDOS = shopMapper.selectList();
+        return BeanUtils.toBean(shopDOS, UserRespVO.class);
+    }
+
 }