Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform...

guang

2024-06-14 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb

Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander


 Conflicts:

	.gitignore

 .gitignore

@@ -8,4 +8,4 @@
/httpRequests/

/.idea
*/target
*/target

 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java

@@ -41,6 +41,8 @@
    private BigDecimal refundIncrement;
    /**必填 退款总积分 */
    private BigDecimal refundIntegral;
    /**必填 退款总抵扣积分 */
    private BigDecimal refundIntegralDeduction;

    ////操作人信息
    /**必填 操作人类型 */

 crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java

@@ -17,6 +17,8 @@
    private String thirdPartyNo;
    /***已退款总金额***/
    private BigDecimal refundTotal = BigDecimal.ZERO;
    /***已退款总抵扣金额***/
    private BigDecimal refundDeductionTotal = BigDecimal.ZERO;

    /**********退款类型************/
    /**退款类型类型-微信*/
@@ -31,5 +33,7 @@
    public static final int REFUND_TYPE_INCREMENT = 6;
    /**退款类型类型--his的退款方式（所有方式代表）*/
    public static final int REFUND_TYPE_HIS = 7;
    /**退款类型类型--抵扣积分*/
    public static final int REFUND_TYPE_INTEGRAL_CASH = 8;

}

 crm-platform-feign/src/main/java/com/hz/crm/feign/FCouponService.java

@@ -10,7 +10,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-coupon")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-coupon")
public interface FCouponService {

    @PostMapping(value = "/coupon/getGoodsSku")

 crm-platform-feign/src/main/java/com/hz/crm/feign/FDoctorTimeService.java

@@ -11,7 +11,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-doctorTime")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-doctorTime")
public interface FDoctorTimeService {

    @PostMapping(value = "/doctor/time/sync")

 crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java

@@ -9,7 +9,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-goods")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-goods")
public interface FGoodsService {

    @PostMapping(value = "/goods/spec/check")

 crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java

@@ -15,7 +15,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-goods-sku")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-goods-sku")
public interface FGoodsSkuService {

    /**sku列表*/

 crm-platform-feign/src/main/java/com/hz/crm/feign/FGroupActivityService.java

@@ -10,7 +10,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "crm-platform-service", path = "/crm-platform", contextId = "crm-group-activity")
@FeignClient(name = "crm-user", path = "/crm-platform", contextId = "crm-group-activity")
public interface FGroupActivityService {

    /**专区列表*/

 crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java

@@ -9,7 +9,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-order-refund")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-order-refund")
public interface FOderRefundService {

    @PostMapping(value = "/order/refund/refundAmount")

 crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java

@@ -15,7 +15,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-order")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-order")
public interface FOderService {

    /**取消订单*/

 crm-platform-feign/src/main/java/com/hz/crm/feign/FOldBrinNewService.java

@@ -10,7 +10,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-oldBrinNew")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-oldBrinNew")
public interface FOldBrinNewService {

    @PostMapping(value = "/oldBrinNew/give/integral")

 crm-platform-feign/src/main/java/com/hz/crm/feign/FSyncPhisAppealTypeRelateService.java

@@ -11,7 +11,7 @@
 * @USER: fhx
 * @DATE: 2023/8/14
 **/
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "sync-phis-appeal-type-relate")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "sync-phis-appeal-type-relate")
public interface FSyncPhisAppealTypeRelateService {

    /** 初始数据 */

 crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java

@@ -9,7 +9,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-user")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-user")
public interface FUserService {

    @PostMapping(value = "/user/info")

 crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FGoodsTypeService.java

@@ -11,7 +11,7 @@
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 * @author CJH
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-goods-type")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-goods-type")
public interface FGoodsTypeService {

    /**

 crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FIntegralGoodsService.java

@@ -12,7 +12,7 @@
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 * @author CJH
 */
@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-integral-goods")
@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-integral-goods")
public interface FIntegralGoodsService {

    /**