Merge branch 'master-prod-new' into master-stander

fwq

2024-07-08 971eb04d09d950f7fa0d534560a76dd69d84c69c

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

@@ -14,7 +14,7 @@
 * @Date 2022/8/8 17:36
 * @Version 1.0
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "activity")
@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "activity")
public interface SActivityService {

    /**
@@ -32,7 +32,7 @@
     * @return Result
     */
    @PostMapping(value = "/activity/shopId/list")
    Result getActivityList(@RequestParam("shoId") String shoId);
    Result getActivityList(@RequestParam("shoId") String shoId,@RequestParam("appId") String appId);


    /**
@@ -42,8 +42,9 @@
     * @param ordersTotal 订单总金额
     * @return Result
     */
    @PostMapping(value = "/activity/list")
    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
    @PostMapping(value = "/activity/check")
    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,
                 @RequestParam("ordersTotal") BigDecimal ordersTotal,@RequestParam("shopId") String shopId);