Merge remote-tracking branch 'origin/master-fwq优惠券分类优化' into master-prod-new

rx

2023-08-21 d8afbdc39cd6e7739054fc1cc21898e0b81216d0

Merge remote-tracking branch 'origin/master-fwq优惠券分类优化' into master-prod-new

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

@@ -29,6 +29,8 @@
    private String commonId;
    /**来源类型 CouponReleaseRecordItem*/
    private String commonType;
    /**来源子标识*/
    private String commonItemId;

    /**发送的用户信息*/
    private List<CouponSendUserDto> sendUserList;

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

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

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

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponTypeDto extends PageDto {
    /**是否营销助手可申请*/
    private Integer isMarketAssistantApply;
}

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

@@ -132,9 +132,14 @@
    Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);

    /**
     * 查询优惠券分类
     * 查询基础分类
     */
    @PostMapping(value = "/coupon/type/list")
    Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);

    /**
     * 查询优惠券分类
     */
    @PostMapping(value = "/couponType/list")
    Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
}