添加Affiliate功能

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

@@ -4,19 +4,23 @@ package com.ai.da.controller;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.entity.Affiliate;
 import com.ai.da.model.dto.AffiliateQueryDTO;
+import com.ai.da.model.vo.AffiliateInvitationDetailsVO;
 import com.ai.da.model.vo.AffiliateVO;
 import com.ai.da.service.AffiliateService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 @Slf4j
 @RestController
 @RequestMapping("/api/affiliate")
+@Api(tags = "Affiliate模块")
 public class AffiliateController {
 
     @Resource
@@ -46,7 +50,7 @@ public class AffiliateController {
         return Response.success(affiliateService.applicationApproval(id, isApproved));
     }
 
-    @ApiOperation(value = "审批affiliate申请")
+    @ApiOperation(value = "定时计算佣金")
     @GetMapping("/testTask")
     public Response<String> testTask() {
         affiliateService.updateAffiliateInfoWithPayment();
@@ -59,5 +63,11 @@ public class AffiliateController {
         return Response.success(affiliateService.affiliateLinkViewsIncrease(id));
     }
 
+    @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));
+    }
+
 
 }

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

@@ -3,9 +3,10 @@ package com.ai.da.controller;
 import com.ai.da.common.enums.OrderStatusEnum;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.ai.da.model.dto.QueryPageByTimeDTO;
+import com.ai.da.model.vo.OrderListVO;
 import com.ai.da.service.OrderInfoService;
+import com.ai.da.service.PaymentInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -22,10 +23,13 @@ public class OrderInfoController {
     @Resource
     private OrderInfoService orderInfoService;
 
+    @Resource
+    private PaymentInfoService paymentInfoService;
+
     @ApiOperation("订单列表")
     @PostMapping("/list")
-    public Response<PageBaseResponse<OrderInfo>> list(@Valid @RequestBody QueryPageByTimeDTO queryPageByTimeDTO){
-        PageBaseResponse<OrderInfo> orderByAccountId = orderInfoService.getOrderByPage(queryPageByTimeDTO);
+    public Response<PageBaseResponse<OrderListVO>> list(@Valid @RequestBody QueryPageByTimeDTO queryPageByTimeDTO){
+        PageBaseResponse<OrderListVO> orderByAccountId = paymentInfoService.getPaymentInfo(queryPageByTimeDTO);
 //        List<OrderInfo> list = orderInfoService.listOrderByCreateTimeDesc();
         return Response.success(orderByAccountId);
     }

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

@@ -70,8 +70,8 @@ public class StripeController {
 
     @ApiOperation("取消订阅")
     @GetMapping("/cancelSubscription")
-    public Response<String> cancelSubscription(@RequestParam String subscriptionId) {
-        stripeService.cancelSubscription(subscriptionId);
+    public Response<String> cancelSubscription(@RequestParam String subscriptionId, @RequestParam String reason) {
+        stripeService.cancelSubscription(subscriptionId, reason);
         return Response.success("success");
     }
     @ApiOperation("临时 取消订阅")