Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java

@@ -1,11 +1,10 @@
package com.dsh.account.feignclient.activity;


import com.dsh.account.dto.Location;
import com.dsh.account.feignclient.activity.model.*;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.ProductDetailsVo;
import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.model.vo.userBenefitDetail.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +15,7 @@
public interface MerChandiseClient {

    @PostMapping("/base/pointMerchars/convertGoods")
    public List<IntegralCommodity> getConvertibleGoods();
    public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location);


    @PostMapping("/base/pointMerchars/getCommoditys")
@@ -65,8 +64,6 @@
    void deletePaymentRecord(@RequestBody String code);






    @PostMapping("/base/pointMerchars/getConsumeDetails")
    List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo);
}