From 218d828e0d1b4967bf00aeb9ad5bc4df2fbae561 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 15 Apr 2025 15:58:22 +0800 Subject: [PATCH] =?UTF-8?q?Stripe=E6=8E=A8=E5=B9=BF=E7=A0=81=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/controller/StripeController.java | 7 +++++ .../mapper/primary/entity/ProductCoupons.java | 9 +++--- .../com/ai/da/model/dto/CreateCouponDTO.java | 4 +++ .../java/com/ai/da/service/StripeService.java | 2 ++ .../impl/CollectionElementServiceImpl.java | 3 ++ .../ai/da/service/impl/StripeServiceImpl.java | 28 ++++++++++++++++++- 6 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/controller/StripeController.java b/src/main/java/com/ai/da/controller/StripeController.java index 416b3abe..261777ae 100644 --- a/src/main/java/com/ai/da/controller/StripeController.java +++ b/src/main/java/com/ai/da/controller/StripeController.java @@ -134,6 +134,13 @@ public class StripeController { public Response retrievePromotionCode(@RequestParam String retrievePromotionCode){ return Response.success(stripeService.retrievePromotionCode(retrievePromotionCode)); } + + @ApiOperation("更新推广码信息") + @GetMapping("/updatePromCodeInfo") + public Response updateCouponsInfo(@RequestParam Long id, @RequestParam(required = false) Long paidCommission, + @RequestParam(required = false) String cooperator, @RequestParam(required = false) String remark){ + return Response.success(stripeService.updateCouponsInfo(id, paidCommission, cooperator, remark)); + } /*@ApiOperation("临时 取消订阅") @GetMapping("/cancelSubscriptionTemp") public Response cancelSubscriptionTemp(@RequestParam String subscriptionId) { diff --git a/src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java b/src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java index 07ebb3bb..2ffe97fb 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java @@ -3,10 +3,12 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @Data @TableName("t_product_coupons") +@NoArgsConstructor public class ProductCoupons extends BaseEntity{ // 优惠券id private String couponId; @@ -35,16 +37,15 @@ public class ProductCoupons extends BaseEntity{ // 备注 private String remark; - public ProductCoupons() { - } - - public ProductCoupons(String couponId, Long redeemBy, String promotionCodeId, String promotionCode, Long maxRedemptions, float percentOff, float commissionRate) { + public ProductCoupons(String couponId, Long redeemBy, String promotionCodeId, String promotionCode, Long maxRedemptions, float percentOff, float commissionRate, String cooperator, String remark) { this.couponId = couponId; this.redeemBy = redeemBy; this.promotionCodeId = promotionCodeId; this.promotionCode = promotionCode; this.maxRedemptions = maxRedemptions; this.percentOff = percentOff; + this.cooperator = cooperator; + this.remark = remark; this.commissionRate = commissionRate; } } diff --git a/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java b/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java index 5985baba..311f7c67 100644 --- a/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java +++ b/src/main/java/com/ai/da/model/dto/CreateCouponDTO.java @@ -17,4 +17,8 @@ public class CreateCouponDTO { private Long timestamp; @ApiModelProperty("推广码最大使用次数") private Long maxRedemptions; + @ApiModelProperty("合作者/机构名") + private String cooperator; + @ApiModelProperty("备注") + private String remark; } diff --git a/src/main/java/com/ai/da/service/StripeService.java b/src/main/java/com/ai/da/service/StripeService.java index 97f94b17..7769fa66 100644 --- a/src/main/java/com/ai/da/service/StripeService.java +++ b/src/main/java/com/ai/da/service/StripeService.java @@ -61,6 +61,8 @@ public interface StripeService { CheckCouponsVO checkProductCoupon(String promotionCode, Long price); + ProductCoupons updateCouponsInfo(Long id, Long paidCommission, String cooperator, String remark); + ProductCoupons getProductCoupon(String promotionCode, String promotionCodeId); String retrieveCoupon(String couponId); diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 6fa0521b..a9ad15da 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -986,6 +986,9 @@ public class CollectionElementServiceImpl extends ServiceImpl