Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

rx

2023-10-24 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553

Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java

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

New file
@@ -0,0 +1,22 @@
package com.hz.his.dto.coupon;

import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.List;
import java.util.Map;

/**
 * 优惠券新增参数
 */
@Data
public class CouponAddDto extends PageDto {
    /**优惠券标题 */
    private String title;
    /**申请类型**/
    private Integer type;
    /**指定项目 或者 通用项目 ID,name **/
    private List<Map<String,Object>> serviceIds;
    /**门店ID*/
    private String shopId;
}

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

@@ -56,4 +56,7 @@
    private String couponTypeId;
    /** 基础分类-优惠券*/
    private String type;

    /** 优惠券ID*/
    private List<String> couponIdList;
}

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

@@ -25,4 +25,9 @@
    private String costDeptName;
    /**归属成本部门名称 -非必填 */
    private String ascrCostDeptName;

    /**发放类型 */
    private Integer belongType;
    /**发放门店*/
    private String sendShopId;
}

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

@@ -149,4 +149,12 @@
     */
    @PostMapping(value = "/couponType/list")
    Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);


    /**
     * 查询优惠券剩余数量 多个
     */
    @PostMapping(value = "/check/coupon/surplus/num")
    Result checkCouponSurplusNum(@RequestBody(required = false) CouponDto dto);

}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "organization")
public interface SOrganizationDeptService {


    /**
     * 获取组织架构字典列表
     */
    @PostMapping(value = "organization/dept/list")
    Result getList(@RequestBody(required = false) PageDto pageDto);

}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponAddDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

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

    /**
     * 开放平台-校验优惠券是否存在 创建或者更新
     */
    @PostMapping(value = "/coupon/quota/config/info")
    Result getConfigInfo(@RequestBody CouponAddDto couponAddDto);


}

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

@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponAddDto;
import com.hz.his.dto.coupon.CouponDto;
import com.hz.his.dto.coupon.CouponSendDto;
import com.hz.his.dto.coupon.OrderSendCouponDto;
@@ -71,4 +72,23 @@
    Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);



    /**
     * 开放平台-校验优惠券是否存在 创建或者更新
     */
    @PostMapping(value = "/coupon/check/create")
    Result couponCheckCreate(@RequestBody CouponAddDto couponAddDto);

    /**
     * 开放平台-获取优惠券限额配置 总的
     */
    @PostMapping(value = "/coupon/use/quato/info/by/total")
    Result couponUseQuotaInfoByTotal(@RequestBody CouponAddDto couponAddDto);

    /**
     * 开放平台-获取优惠券限额配置 当前月
     */
    @PostMapping(value = "/coupon/use/quato/info/by/month")
    Result couponUseQuotaInfoByMonth(@RequestBody CouponAddDto couponAddDto);

}