From f148baa0e2c5cbcc6344bd34a44059eb8260f7f6 Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期二, 09 八月 2022 20:15:05 +0800 Subject: [PATCH] 团购活动优化 --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 2 +- phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java | 5 +++++ phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java | 4 +++- phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 8 ++++++++ phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4 +++- phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java | 18 ++++++++++++++++++ 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java index bda847d..ce3d55d 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java @@ -12,5 +12,10 @@ public class ActivityDto extends PageDto { /**闂ㄥ簵鏍囪瘑 */ private String shopId; + /**鍥㈣喘鍟嗗搧绫诲瀷鏍囪瘑 */ + private String typeId; + /**鍥㈣喘娲诲姩鏍囪瘑 */ + private String groupBuyId; + } diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java index 5b50ee8..4c4603a 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java @@ -18,12 +18,14 @@ private String operatorId; /**鎿嶄綔浜哄悕绉�*/ private String operatorName; + /**娲诲姩鏍囪瘑*/ + private String groupBuyId; /**鍙戦�佽褰�*/ private CouponRecordDto couponReleaseRecordItem; /**鐢ㄦ埛璇︽儏*/ private List<UserArrDto> userArr; - + private List<CouponItemDto> itemDtoList; /**淇敼鏃堕棿*/ private String updateTime; diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java index a05323d..ac67919 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java @@ -10,12 +10,14 @@ * 鍟嗗搧浼樻儬鍒告墿灞� * */ @Data -public class CouponGoodsDto { +public class CouponGoodsDto { /**鐢ㄦ埛鏍囪瘑*/ private String userId; /**鏍囪瘑*/ private String commonId; + /**浼樻儬鍒告爣璇�*/ + private String couponId; /**鎬婚噾棰�*/ diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java new file mode 100644 index 0000000..e18ddd8 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java @@ -0,0 +1,18 @@ +package com.hz.his.dto.coupon; + +import lombok.Data; + +/** + * @author fwq + * 鍙戦�佷紭鎯犲埜dto + */ +@Data +public class CouponItemDto { + + /**浼樻儬鍒告爣璇�*/ + private String couponId; + + /**鏍囪瘑鐖舵爣璇嗗瓧绗︿覆閫楀彿鍒嗛殧*/ + private Integer num; + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java index b3c9610..2bca4c3 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java @@ -43,7 +43,7 @@ * @return Result */ @PostMapping(value = "/activity/list") - Result getActivityList(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal); + Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal); diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java index 9673a12..f0567c2 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java @@ -50,4 +50,12 @@ @PostMapping(value = "/goods/canUsed/coupon") Result goodsCanUsedCoupon(@RequestBody CouponGoodsDto couponGoodsDto); + + /** + * 鐢ㄦ埛鏄惁棰嗗彇杩囧洟璐椿鍔ㄤ紭鎯犲埜 + */ + @PostMapping(value = "/check/group/coupon") + Result checkGroupCoupon(@RequestBody CouponGoodsDto couponGoodsDto); + + } -- Gitblit v1.8.0