Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-06 71fd3964aacb88c150bec97b90452989fb2b380b

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java

@@ -8,9 +8,12 @@
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.factory.MemberFallbackFactory;
import java.util.List;
import java.util.Set;

import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -32,13 +35,16 @@
    R<List<Member>> getMemberListByIds(@RequestParam("memberIdList") Set<Long> memberIdList,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/member/miniLogin")
    @PostMapping("/forepart/member/miniLogin")
    public R<AppMiniLoginVO> miniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);

    @PostMapping("/forepart/auction-salesroom/actionMiniLogin")
    public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);


    @PostMapping("/member/miniRegister")

    @PostMapping("/forepart/member/miniRegister")
    public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appUserRegisterDto);

    @PostMapping("/member-points/addMemberPoints")
    R<?> addMemberPoints(@RequestBody MemberPointsDTO memberPointsDTO);

}