Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-06-07 5bb9492f10f08c8f2ab5485d25ae9e2bbf3a3849

Merge branch 'master-fwq-爆款活动2.0' into master-test

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

@@ -27,6 +27,6 @@
     * 根据活动编码查询赠送的增值金
     */
    @PostMapping(value = "/order/activity/increment/money")
    Result getActivityIncrement(@RequestBody OrderActivityVo orderActivityVo);
    Result getActivityReturn(@RequestBody OrderActivityVo orderActivityVo);

}

 phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java

@@ -18,7 +18,11 @@
    private BigDecimal incrementMoney = BigDecimal.ZERO;
    /**返赠的积分*/
    private BigDecimal integralMoney = BigDecimal.ZERO;
    /**返赠的优惠券数量*/
    private Integer couponNum = 0;
    /**邀请的人数*/
    private Integer inviteeNum = 0;
    /**分享的人数*/
    private Integer shareNum = 0;

}

 phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java

@@ -2,6 +2,8 @@

import lombok.Data;

import java.util.List;

/**
 * @author CJH
 */
@@ -18,4 +20,6 @@
    private String inviteeUserId;
    /**金额的来源类型*/
    private String operationReason;
    /**返赠金额参与的活动*/
    private List<String> codeList;
}