phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityCountVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -20,6 +20,8 @@ private String commonItemId; /**公共类型*/ private String commonType; /**来源标识*/ private String sourceId; /**公共标识类型,充值订单标识*/ public static String TYPE_COMMON_ORDER_RECHARGE = "recharge"; @@ -45,4 +47,8 @@ public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken"; /**公共标识类型,爆款活动领取 */ public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity"; /**公共标识类型,爆款活动分享赠送 */ public static String TYPE_COMMON_BURST_ACTIVITY_SHARE = "burst_activity_share"; /**公共标识类型,爆款活动规则赠送 */ public static String TYPE_COMMON_BURST_ACTIVITY_RULE = "burst_activity_rule"; } phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
@@ -1,13 +1,11 @@ package com.hz.his.feign.service.phis; import com.hx.resultTool.Result; import com.hz.phis.vo.order.OrderActivityCountVo; import com.hz.phis.vo.order.OrderActivityVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.math.BigDecimal; /**订单活动查询 * @author CJH @@ -16,7 +14,7 @@ public interface SOrderActivityService { /** * 根据活动编码查询订单是否已经执行 * 根据活动编码查询是否执行+是否消费+赠送数据 * @param orderActivityVo 对象 * @return Result 使用OrderActivityReturnVo转化 */ @@ -24,9 +22,11 @@ Result getActivityExecute(@RequestBody OrderActivityVo orderActivityVo); /** * 根据活动编码查询赠送的增值金 * 获取用户活动返赠的数据 * @param orderActivityVo 对象 * @return Result 使用OrderActivityReturnVo转化 */ @PostMapping(value = "/order/activity/increment/money") Result getActivityReturn(@RequestBody OrderActivityVo orderActivityVo); Result getActivityReturn(@RequestBody OrderActivityCountVo orderActivityVo); } phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityCountVo.java
New file @@ -0,0 +1,21 @@ package com.hz.phis.vo.order; import lombok.Data; import java.util.List; /** * @author fwq */ @Data public class OrderActivityCountVo { /**用户hisId-必填*/ private String userId; /**参与的活动*/ private List<String> codeList; /**金额的来源类型*/ private String operationReason; /**优惠券来源类型(CouponRecordDto)*/ private String couponType; } phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
@@ -13,12 +13,11 @@ private Integer isExecute = 0; /**是否已下单*/ private Integer isOrder = 0; /**返赠的增值金*/ /**增值金*/ private BigDecimal incrementMoney = BigDecimal.ZERO; /**返赠的积分*/ /**积分*/ private BigDecimal integralMoney = BigDecimal.ZERO; /**返赠的优惠券数量*/ /**优惠券数量*/ private Integer couponNum = 0; /**邀请的人数*/ private Integer inviteeNum = 0; phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
@@ -2,24 +2,27 @@ import lombok.Data; import java.util.List; /** * @author CJH */ @Data public class OrderActivityVo { /**活动页面类型-指定订单标识*/ private String orderId; /**活动页面类型-可空*/ private Integer activityPageType; /**活动区分编号-必填*/ private String activityPageCode; /**his用户-必填*/ /**用户hisId-必填*/ private String userId; /**邀请人hisId*/ private String inviteeUserId; /**活动区分编号*/ private String activityPageCode; /**查询消费和执行*/ private Boolean selectJoin = false; /**查询金额*/ private Boolean selectMoney = false; /**金额的来源类型*/ private String operationReason; /**返赠金额参与的活动*/ private List<String> codeList; /**查询优惠券*/ private Boolean selectCoupon = false; /**优惠券来源类型(CouponRecordDto)*/ private String couponType; }