Affiliate功能-数据库表设计更新

src/main/java/com/ai/da/controller/AffiliateController.java

@@ -28,7 +28,7 @@ public class AffiliateController {
 
     @ApiOperation(value = "注册成为affiliate")
     @GetMapping("/registration")
-    public Response<Boolean> completeGuidance(@RequestParam("promotionMethod") String promotionMethod) {
+    public Response<Boolean> completeGuidance(@RequestParam(value = "promotionMethod", required = false) String promotionMethod) {
         return Response.success(affiliateService.registerAsAnAffiliate(promotionMethod));
     }
 
@@ -44,18 +44,31 @@ public class AffiliateController {
         return Response.success(affiliateService.personalAffiliateCenter());
     }
 
+    @ApiOperation(value = "获取个人佣金图表数据")
+    @GetMapping("/getPersonalMonthlyIncome")
+    public Response<double[]> getPersonalMonthlyIncome(@RequestParam("year")int year) {
+        return Response.success(affiliateService.getPersonalMonthlyIncome(year));
+    }
+
     @ApiOperation(value = "审批affiliate申请")
     @GetMapping("/approval")
     public Response<Boolean> applicationApproval(@RequestParam("id") Long id, @RequestParam("isApproved")Boolean isApproved) {
         return Response.success(affiliateService.applicationApproval(id, isApproved));
     }
 
-    @ApiOperation(value = "定时计算佣金")
+    /*@ApiOperation(value = "定时计算佣金")
     @GetMapping("/testTask")
     public Response<String> testTask() {
         affiliateService.updateAffiliateInfoWithPayment();
         return Response.success("success ");
-    }
+    }*/
+
+    /*@ApiOperation(value = "每月发送结算邮件")
+    @GetMapping("/commissionCalculation")
+    public Response<String> commissionCalculation() {
+        affiliateService.commissionCalculation(null, null);
+        return Response.success("success ");
+    }*/
 
     @ApiOperation(value = "affiliate链接浏览量增加")
     @GetMapping("/viewsIncrease")
@@ -64,9 +77,9 @@ public class AffiliateController {
     }
 
     @ApiOperation(value = "获取每个affiliate产生的收入")
-    @GetMapping("/getEachAffiliateGeneratedRevenue")
-    public Response<List<AffiliateInvitationDetailsVO>> getEachAffiliateGeneratedRevenue(@RequestParam("id") Long id, @RequestParam(required = false)  String startTime, @RequestParam(required = false) String endTime) {
-        return Response.success(affiliateService.getEachAffiliateGeneratedRevenue(id, startTime, endTime));
+    @PostMapping("/getEachAffiliateGeneratedRevenue")
+    public Response<IPage<AffiliateInvitationDetailsVO>> getEachAffiliateGeneratedRevenue(@RequestBody AffiliateQueryDTO affiliateQueryDTO) {
+        return Response.success(affiliateService.getEachAffiliateGeneratedRevenue(affiliateQueryDTO));
     }
 
 

src/main/java/com/ai/da/controller/StripeController.java

@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "Stripe模块")
 @Slf4j
@@ -70,7 +71,7 @@ public class StripeController {
 
     @ApiOperation("取消订阅")
     @GetMapping("/cancelSubscription")
-    public Response<String> cancelSubscription(@RequestParam String subscriptionId, @RequestParam String reason) {
+    public Response<String> cancelSubscription(@RequestParam String subscriptionId, @RequestParam(required = false) String reason) {
         stripeService.cancelSubscription(subscriptionId, reason);
         return Response.success("success");
     }
@@ -101,8 +102,14 @@ public class StripeController {
 
     @ApiOperation("临时 查询指定用户绑定的付款方式")
     @GetMapping("/getCustomerPaymentMethod")
-    public Response<String> getCustomerPaymentMethod(@RequestParam String name, @RequestParam String email) {
+    public Response<List<Map<String,String>>> getCustomerPaymentMethod(@RequestParam String name, @RequestParam String email) {
         return Response.success(stripeService.getCustomerPaymentMethod(name, email));
     }
 
+    @ApiOperation("临时 解绑指定用户绑定的所有付款方式")
+    @GetMapping("/detachCustomerAllPaymentMethod")
+    public Response<String> detachCustomerAllPaymentMethod(@RequestParam String name, @RequestParam String email) {
+        return Response.success(stripeService.detachCustomerAllPaymentMethod(name, email));
+    }
+
 }