Merge remote-tracking branch 'origin/master'

fwq

2022-08-09 e4e7ba66a8d70300b2533852e7d573b8deab063d

Merge remote-tracking branch 'origin/master'

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

File was deleted

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

New file
@@ -0,0 +1,50 @@
package com.hz.his.feign.service.phis;

import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;

/**
 * @ClassName SActivityController
 * @Description 活动规则
 * @Author Wrh
 * @Date 2022/8/8 17:36
 * @Version 1.0
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "activity")
public interface SActivityService {

    /**
     * 活动规则详情
     * @param id 活动标识
     * @return Result
     */
    @PostMapping(value = "/activity/detail")
    Result getActivityDetail(@RequestParam("id") String id);


    /**
     * 活动规则列表
     * @param shoId 门店标识
     * @return Result
     */
    @PostMapping(value = "/activity/shopId/list")
    Result getActivityList(@RequestParam("shoId") String shoId);


    /**
     * 校验用户是否符合活动规则
     * @param userId 用户标识
     * @param id 活动标识
     * @param ordersTotal 订单总金额
     * @return Result
     */
    @PostMapping(value = "/activity/list")
    Result getActivityList(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);



}

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

New file
@@ -0,0 +1,24 @@
package com.hz.his.feign.service.platform;

import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @Author
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-meituan")
public interface SPhipMeiTuanOrderService {

    /**
     * 美团订单推送crm验证
     * @param jsonObject
     * orderId 美团订单id
     * phone 手机号
     * @return
     */
    @PostMapping(value = "/meituan/order/sendCrm")
    Result sendCrm(@RequestBody JSONObject jsonObject);
}