fwq
2023-12-06 b020f119176dcc1c60ec1c97bd03d9a3efe8b5fa
Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
2个文件已修改
15 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
@@ -56,6 +56,13 @@
    private String activityCouponId;
    /** 营销活动分组id */
    private String groupId;
    /** 营销活动领取记录子项itemid */
    private String recordItemId;
    /**审核状态 查询 0=无需审批 1=待审批 2=审批成功 3=审批失败*/
    private Integer approvalStatus;
    /**审批状态 通过=agree 拒绝=reject*/
    private String statusStr;
    /** 平台类型(PlatformConstants) */
    private String platformType;
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
@@ -38,4 +38,12 @@
    @PostMapping(value = "/market/activity/receiveCoupon")
    Result receiveCoupon(@RequestBody MarketActivityDto dto);
    /** 审批列表 */
    @PostMapping(value = "/market/activity/approve/list")
    Result pendingApproveCoupon(@RequestBody MarketActivityDto dto);
    /** 操作审批领取优惠券 */
    @PostMapping(value = "/market/activity/receive/approve/callback/admin")
    Result receiveApproveCallbackAdmin(@RequestBody MarketActivityDto dto);
}