Merge branch 'master-fwq积分限购' into master-test

fwq

2023-07-18 627a1768b5953a01ff3df44532e75a0bb758c1dd

Merge branch 'master-fwq积分限购' into master-test

 phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java

New file
@@ -0,0 +1,16 @@
package com.hz.his.dto.activity;


import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * 限制
 */
@Data
public class ActivityLimitDto extends PageDto {
    /**id*/
    private String id;
    /**用户标识*/
    private String userId;
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java

@@ -1,6 +1,7 @@
package com.hz.his.feign.service.phis;

import com.hx.resultTool.Result;
import com.hz.his.dto.activity.ActivityLimitDto;
import com.hz.his.dto.order.OrderDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -30,13 +31,13 @@
     * 根据商品id查询订单数量
     */
    @PostMapping(value = "/order/numByGoodsId")
    Result queryOrderNumByGoodsId(@RequestParam("goodsId") String goodsId,@RequestParam("userId") String userId);
    Result queryOrderNumByGoodsId(@RequestBody ActivityLimitDto activityLimitDto);

    /**
     * 根据活动id查询订单数量
     */
    @PostMapping(value = "/order/numByActivityId")
    Result queryOrderNumByActivityId(@RequestParam("activityId") String activityId,@RequestParam("userId") String userId);
    Result queryOrderNumByActivityId(@RequestBody ActivityLimitDto activityLimitDto);

    /**
     * 订单列表