Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2024-02-23 417d0d22bf20bd53ba6afc031af8fd0fccd2248d

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

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

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

import com.hx.resultTool.Result;
import com.hz.phis.vo.order.OrderActivityVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;

/**订单活动查询
 * @author CJH
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "order-activity")
public interface SOrderActivityService {

    /**
     * 根据活动编码查询订单是否已经执行
     * @param orderActivityVo 对象
     * @return Result 使用OrderActivityReturnVo转化
     */
    @PostMapping(value = "/order/activity/execute")
    Result getActivityExecute(@RequestBody OrderActivityVo orderActivityVo);

}

 phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java

New file
@@ -0,0 +1,12 @@
package com.hz.phis.vo.order;

import lombok.Data;

/**
 * @author CJH
 */
@Data
public class OrderActivityReturnVo {
    /**活动的订单是否已执行：0否1是*/
    private Integer isExecute;
}

 phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java

New file
@@ -0,0 +1,18 @@
package com.hz.phis.vo.order;

import lombok.Data;

/**
 * @author CJH
 */
@Data
public class OrderActivityVo {
    /**活动页面类型-指定订单标识*/
    private String orderId;
    /**活动页面类型-可空*/
    private Integer activityPageType;
   /**活动区分编号-必填*/
    private String activityPageCode;
    /**his用户-必填*/
    private String userId;
}