Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

puzhibing

2026-09-21 008ffb622f7e8b941245a4cf19042c7baef39b24

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java

@@ -8,11 +8,13 @@
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.factory.RemoteMemberFallbackFactory;
import com.ruoyi.system.api.model.AddIntegralRecordVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

@@ -202,6 +204,17 @@


    /**
     * @param giftId
     * @return R<MemberGiftRecord>
     * @description 根据礼品id获取数据
     * @author jqs
     * @date 2023/7/8 17:43
     */
    @PostMapping("/member/getVerifyPrizeByGiftId")
    public R<MemberGiftRecord> getVerifyPrizeByGiftId(@RequestBody String giftId);
    
    
    /**
     * @param integralChangeDto
     * @return R
     * @description 积分变动
@@ -254,12 +267,51 @@
    public R verifyPrize(@RequestBody MerVerifyPrizeFinalDto merVerifyPrizeFinalDto);

    /**
     * @param ageType
     * @return R<List < Long>>
     * @description
     * @author  jqs
     * @date    2023/8/23 19:06
     * @param ageType
     * @return  R<List<Long>>
     */
    @PostMapping("/member/listUserIdByAgeType")
    public R<List<Long>> listUserIdByAgeType(@RequestBody Integer ageType);
    
    /**
     * 手动添加用户积分
     *
     * @param integral
     * @param userId
     * @return
     */
    @PostMapping("/member/addIntegralRecord")
    R addIntegralRecord(@RequestBody AddIntegralRecordVo addIntegralRecordVo);
    
    /**
     * 添加奖品数据
     *
     * @param memberGiftRecord
     * @return
     */
    @PostMapping("/member/saveMemberGiftRecord")
    R saveMemberGiftRecord(@RequestBody MemberGiftRecord memberGiftRecord);
    
    /**
     * 修改会员数据
     *
     * @param member
     * @return
     */
    @PostMapping("/member/editMember")
    R editMember(@RequestBody Member member);
    
    
    /**
     * 获取微信二维码
     *
     * @param scene
     * @param path
     * @return
     */
    @PostMapping("/member/getWeiXinQrCode")
    public String getWeiXinQrCode(@RequestParam("scene") String scene, @RequestParam("path") String path);
}