Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java

@@ -72,7 +72,7 @@
     * @date 2022-03-29 13:17:41
     */
    @GetMapping("/detail")
    R detailById(@RequestParam("id") Long id);
    R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId);

    /**
     * description  queryByList  查询列表
@@ -101,4 +101,36 @@
     */
    @PostMapping("/start/fight")
    R startFight(@RequestBody StartFightOrderDto orderDto);

    /**
     * 创建砍价订单
     * @param orderDto  请求参数
     * @return  创建订单结果
     */
    @PostMapping("/start/bargain")
    R startBargain(@RequestBody StartBargainOrderDto orderDto);

    /**
     * 帮好友砍价
     * @param orderDto  请求参数
     * @return  创建订单结果
     */
    @PostMapping("/start/user/bargain")
    R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto);

    /**
     * 查询砍价记录详情
     * @param id  砍价记录id
     * @return  创建订单结果
     */
    @GetMapping("/user/bargain")
    R getUserBargain(@RequestParam("id") Long id);

    /**
     * 创建秒杀订单
     * @param orderDto  请求参数
     * @return  创建订单结果
     */
    @PostMapping("/start/seckill")
    R startSeckill(@RequestBody StartSeckillOrderDto orderDto);
}