Merge pull request #96 from yanyanho/main

refactor the share interface
Dapp-Learning-DAO · Dec 15, 2023 · 5a75e67 · 5a75e67
2 parents 9a0bf96 + 8310e8a
commit 5a75e67
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/src/main/java/com/dl/officialsite/sharing/SharingController.java b/src/main/java/com/dl/officialsite/sharing/SharingController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("share/usershare")
+@RequestMapping("/share")
 @Slf4j
 public class SharingController {
 
@@ -66,18 +66,18 @@ public BaseResponse loadSharing(@RequestParam(value = "pageNo",defaultValue = "1
      * @param shareId
      * @return
      */
-    @GetMapping("queryByShareId")
+    @GetMapping("query")
     public BaseResponse<Share> querySharing(@RequestParam("shareId") long shareId){
         return BaseResponse.successWithData(this.sharingService.querySharing(shareId));
     }
 
     /**
      * 查看用户的分享
      */
-    @GetMapping("byUser")
-    public BaseResponse loadSharingByUser(@RequestParam("memberId") long memberId,
+    @GetMapping("user")
+    public BaseResponse loadSharingByUser(@RequestParam("memberAddress") String memberAddress,
                                                              @RequestParam(value = "pageNo",defaultValue = "1") int pageNo,
                                                              @RequestParam(value = "pageSize",defaultValue = "20") int pageSize) {
-        return BaseResponse.successWithData(this.sharingService.loadSharingByUser(memberId, pageNo, pageSize));
+        return BaseResponse.successWithData(this.sharingService.loadSharingByUser(memberAddress, pageNo, pageSize));
     }
 }
diff --git a/src/main/java/com/dl/officialsite/sharing/SharingRepository.java b/src/main/java/com/dl/officialsite/sharing/SharingRepository.java
@@ -15,11 +15,11 @@ public interface SharingRepository extends JpaRepository<Share, Long>, JpaSpecif
     @Query(value = "select count(*) from share", nativeQuery = true)
     int loadAllCount();
 
-    @Query(value = "select * from share where member_id = :memberId limit :offset, :limit", nativeQuery = true)
-    List<Share> findAllSharesByUidPaged(@Param("memberId") long memberId, @Param("offset") int offset, @Param("limit") int limit);
+    @Query(value = "select * from share where member_address = :memberAddress limit :offset, :limit", nativeQuery = true)
+    List<Share> findAllSharesByUidPaged(@Param("memberAddress") String memberAddress, @Param("offset") int offset, @Param("limit") int limit);
 
-    @Query(value = "select count(*) from share where member_id = :memberId", nativeQuery = true)
-    int loadCountByUid(@Param("memberId") long memberId);
+    @Query(value = "select count(*) from share where member_address = :memberAddress", nativeQuery = true)
+    int loadCountByUid(@Param("memberAddress") String memberAddress);
 
 
 }
diff --git a/src/main/java/com/dl/officialsite/sharing/SharingService.java b/src/main/java/com/dl/officialsite/sharing/SharingService.java
@@ -117,11 +117,11 @@ public Share querySharing(long shareId) {
     }
 
 
-    public PagedList loadSharingByUser(long memberId, int pageNo, int pageSize) {
+    public PagedList loadSharingByUser(String memberAddress, int pageNo, int pageSize) {
         int offset  = (pageNo - 1)*pageSize;
-        int totalCount = this.sharingRepository.loadCountByUid(memberId);
+        int totalCount = this.sharingRepository.loadCountByUid(memberAddress);
         int totalPages =(totalCount + pageSize - 1) / pageSize;
-        List<Share> items = this.sharingRepository.findAllSharesByUidPaged(memberId, offset, pageSize);
+        List<Share> items = this.sharingRepository.findAllSharesByUidPaged(memberAddress, offset, pageSize);
 
       //  SharingByUserResp resp = new SharingByUserResp();
         PagedList resp = new PagedList(items ,new Pagination(totalCount, totalPages, pageNo, items.size(), pageNo < totalPages));

diff --git a/src/main/java/com/dl/officialsite/sharing/model/req/InitSharingRewardsReq.java b/src/main/java/com/dl/officialsite/sharing/model/req/InitSharingRewardsReq.java
diff --git a/src/main/java/com/dl/officialsite/sharing/reward/DefaultRewardServiceImpl.java b/src/main/java/com/dl/officialsite/sharing/reward/DefaultRewardServiceImpl.java
@@ -1,10 +1,8 @@
 package com.dl.officialsite.sharing.reward;
 
-import com.dl.officialsite.sharing.model.req.InitSharingRewardsReq;
 import com.dl.officialsite.sharing.model.resp.ClaimSharingRewardResp;
 import com.dl.officialsite.sharing.model.resp.PreCheckSharingRewardResp;
 import com.dl.officialsite.sharing.model.resp.PrepareSharingRewardsResp;
-import com.dl.officialsite.sharing.reward.IRewardService;
 import org.springframework.stereotype.Service;
 
 @Service

diff --git a/src/main/java/com/dl/officialsite/sharing/reward/IRewardService.java b/src/main/java/com/dl/officialsite/sharing/reward/IRewardService.java
@@ -1,6 +1,5 @@
 package com.dl.officialsite.sharing.reward;
 
-import com.dl.officialsite.sharing.model.req.InitSharingRewardsReq;
 import com.dl.officialsite.sharing.model.resp.ClaimSharingRewardResp;
 import com.dl.officialsite.sharing.model.resp.PreCheckSharingRewardResp;
 import com.dl.officialsite.sharing.model.resp.PrepareSharingRewardsResp;

diff --git a/src/main/java/com/dl/officialsite/sharing/reward/InitSharingRewardsReq.java b/src/main/java/com/dl/officialsite/sharing/reward/InitSharingRewardsReq.java
@@ -0,0 +1,4 @@
+package com.dl.officialsite.sharing.reward;
+
+public class InitSharingRewardsReq {
+}
diff --git a/...g/model/req/PreCheckSharingRewardReq.java → ...ring/reward/PreCheckSharingRewardReq.java b/...g/model/req/PreCheckSharingRewardReq.java → ...ring/reward/PreCheckSharingRewardReq.java
@@ -1,4 +1,4 @@
-package com.dl.officialsite.sharing.model.req;
+package com.dl.officialsite.sharing.reward;
 
 import lombok.Data;