Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-14 8c51032933d201b0c7aedbde0af6e5ff52db329d

Merge branch 'master-zhangxu' into master-test

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java

@@ -27,6 +27,8 @@
    public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
    /**公共标识类型,老带新*/
    public static String TYPE_COMMON_OLD_NEW = "old_new";
    /**公共标识类型,团购活动*/
    /**公共标识类型,礼品卡*/
    public static String TYPE_COMMON_GIFT = "gift";
    /**公共标识类型,营销优惠券*/
    public static String TYPE_COMMON_MARKE = "marketing";
}

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

@@ -60,4 +60,8 @@
    @PostMapping(value = "/emp/userId/role/check")
    Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);

    @PostMapping(value = "/emp/role/liset")
    Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);


}

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

@@ -145,5 +145,9 @@
    @PostMapping(value = "/order/refund/nextStep")
    Result nextStep(OrderRefundDto orderRefundDto);


    /**
     * 开放平台-营销助手订单部分退款审核通过/拒绝接口
     */
    @PostMapping(value = "/audit/order/partRefund")
    Result partRefundApproval(@RequestBody AduitDto aduitDto);
}