Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

zhouxiang

2022-09-05 a42b02f3a71afcc0e1152e782ce7ffa541c1e1a9

Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign


 Conflicts:

	phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java

@@ -16,6 +16,10 @@
public class OrderItemPHisDto {
    /**必填 商品类型(OrderItemConstants) crm填默认project,充值就填recharge,纯商品订单填retail零售, */
    private String type;
    /**必填 子单总价，实付价格（元）*/
    private BigDecimal total;
    /**必填 子单总积分，实付积分*/
    private BigDecimal totalIntegral;
    /**非必填 折扣(单位:百分比) 必填，默认100,不传后台默认100*/
    private BigDecimal discount;
    /**必填 购买数量 必填，默认0*/

 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java

@@ -41,7 +41,7 @@
    /**非必填 开发人名称(没有传值默认用户绑定销售顾问的名称) 三少说：crm就填用户，不传,后台处理*/
    private String developerName;

    /**必填 用户Id */
    /**必填 订单所属用户Id */
    private String userId;

    /**crm必填 订单渠道标识（渠道/用户）,三少说：crm必填 */

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

@@ -16,31 +16,31 @@
public interface SPhipOrderService {

    /**
     * 开放平台-新-新增订单更新至phis
     * 开放平台-新-新增订单更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/add")
    Result createOrder(@RequestBody OrderCreateDto params);

    /**
     * 开放平台-新-订单状态更新至phis
     * 开放平台-新-订单状态更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/orderUpdate")
    Result updateOrderStatus(@RequestBody OrdersTotalDto params);

    /**
     * 开放平台-新-订单结账更新至phis
     * 开放平台-新-订单结账更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/pay")
    Result payOrderSuc(@RequestBody OrderPayDto params);

    /**
     * 开放平台-新-订单退款更新至phis
     * 开放平台-新-订单退款更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/refund")
    Result refundOrder(@RequestBody OrderRefundDto params);

    /**
     * 开放平台-新-取消订单更新至phis
     * 开放平台-新-取消订单更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/cancel")
    Result cancelOrder(@RequestBody OrderRefundDto params);