Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

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

@@ -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);