Browse Source

赠券规则管理,评论bug

jyc 2 months ago
parent
commit
21039e3406

+ 4 - 4
alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponStoreFriendController.java

@@ -143,13 +143,13 @@ public class LifeDiscountCouponStoreFriendController {
     }
 
     @ApiOperation("查询好友赠券")
-    @ApiImplicitParams({@ApiImplicitParam(name = "storeUserId", value = "当前登录店铺用户id", dataType = "String", paramType = "query", required = true)
+    @ApiImplicitParams({@ApiImplicitParam(name = "storeId", value = "当前登录店铺id", dataType = "String", paramType = "query", required = true)
     ,@ApiImplicitParam(name = "friendStoreUserId", value = "选中好友店铺用户id", dataType = "String", paramType = "query", required = false)
     })
     @GetMapping("/getReceivedFriendCouponList")
-    private R<List<LifeDiscountCouponFriendRuleDetailVo>> getReceivedFriendCouponList(@RequestParam(value = "storeUserId") String storeUserId, @RequestParam(value = "friendStoreUserId",required = false)String friendStoreUserId) {
-        log.info("LifeDiscountCouponStoreFriendController.getReceivedFriendCouponList?storeId={},friendStoreUserId={}", storeUserId,friendStoreUserId);
-        return R.data(lifeDiscountCouponStoreFriendService.getReceivedFriendCouponList(storeUserId,friendStoreUserId));
+    private R<List<LifeDiscountCouponFriendRuleDetailVo>> getReceivedFriendCouponList(@RequestParam(value = "storeId") String storeId, @RequestParam(value = "friendStoreUserId",required = false)String friendStoreUserId) {
+        log.info("LifeDiscountCouponStoreFriendController.getReceivedFriendCouponList?storeId={},friendStoreUserId={}", storeId,friendStoreUserId);
+        return R.data(lifeDiscountCouponStoreFriendService.getReceivedFriendCouponList(storeId,friendStoreUserId));
     }
 
     @ApiOperation("查询赠券规则")

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

@@ -53,7 +53,7 @@ public interface LifeDiscountCouponStoreFriendService extends IService<LifeDisco
 
     void delFriendCouponRule(String id);
 
-    List<LifeDiscountCouponFriendRuleDetailVo> getReceivedFriendCouponList(String storeUserId,String friendStoreUserId);
+    List<LifeDiscountCouponFriendRuleDetailVo> getReceivedFriendCouponList(String storeId,String friendStoreUserId);
 
     List<LifeDiscountCouponFriendRuleVo> getRuleList(String storeId);
 

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponStoreFriendServiceImpl.java

@@ -388,14 +388,14 @@ public class LifeDiscountCouponStoreFriendServiceImpl extends ServiceImpl<LifeDi
     /**
      * 获取好友送的优惠券列表
      *
-     * @param storeUserId 当前登录店铺用户id
+     * @param storeId 当前登录店铺id
      * @param friendStoreUserId 选中好友店铺用户id
      * @return 领取的优惠券列表
      */
     @Override
-    public List<LifeDiscountCouponFriendRuleDetailVo> getReceivedFriendCouponList(String storeUserId,String friendStoreUserId) {
+    public List<LifeDiscountCouponFriendRuleDetailVo> getReceivedFriendCouponList(String storeId,String friendStoreUserId) {
         QueryWrapper<LifeDiscountCouponFriendRuleDetailVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("ldcsf.store_user_id", storeUserId);
+        queryWrapper.eq("ldcsf.store_user_id", storeId);
         queryWrapper.eq("ldcsf.delete_flag", 0);
         //查询送过优惠券的店铺
         if (StringUtils.isEmpty(friendStoreUserId)) {