Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/model/vo/AccountLoginVO.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

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

@@ -0,0 +1,86 @@
+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
+    private AffiliateService affiliateService;
+
+    @ApiOperation(value = "注册成为affiliate")
+    @GetMapping("/registration")
+    public Response<Boolean> completeGuidance(@RequestParam(value = "promotionMethod", required = false) String promotionMethod) {
+        return Response.success(affiliateService.registerAsAnAffiliate(promotionMethod));
+    }
+
+    @ApiOperation(value = "获取affiliate列表")
+    @PostMapping("/list")
+    public Response<IPage<Affiliate>> getAffiliateList(@Valid @RequestBody AffiliateQueryDTO affiliateQueryDTO) {
+        return Response.success(affiliateService.getAffiliateList(affiliateQueryDTO));
+    }
+
+    @ApiOperation(value = "获取affiliate个人中心")
+    @GetMapping("/personalCenter")
+    public Response<AffiliateVO> personalAffiliateCenter() {
+        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 = "定时计算佣金")
+    @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")
+    public Response<Boolean> viewsGet(@RequestParam("id") Long id) {
+        return Response.success(affiliateService.affiliateLinkViewsIncrease(id));
+    }
+
+    @ApiOperation(value = "获取每个affiliate产生的收入")
+    @PostMapping("/getEachAffiliateGeneratedRevenue")
+    public Response<IPage<AffiliateInvitationDetailsVO>> getEachAffiliateGeneratedRevenue(@RequestBody AffiliateQueryDTO affiliateQueryDTO) {
+        return Response.success(affiliateService.getEachAffiliateGeneratedRevenue(affiliateQueryDTO));
+    }
+
+
+}

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

@@ -66,6 +66,8 @@ public class ElementController {
         return Response.success();
     }
 
+    /** 该功能已删除  */
+    @Deprecated
     @ApiOperation(value = "生成印花")
     @PostMapping("/generatePrint")
     public Response<GenerateCollectionItemVO> generatePrint(@Valid @RequestBody CollectionGeneratePrintDTO generatePrintDTO) {

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

@@ -1,47 +1,55 @@
 package com.ai.da.controller;
 
 import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.ProductPurchaseDTO;
 import com.ai.da.service.StripeService;
 import com.paypal.http.HttpResponse;
 import com.paypal.payments.Refund;
+import com.stripe.exception.StripeException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+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
 @RestController
 @RequestMapping("/api/stripe")
+@ApiIgnore
 public class StripeController {
 
     @Resource
     private StripeService stripeService;
 
     @ApiOperation("创建支付链接")
-    @PostMapping("/createOrder/{amount}")
-    public Response<String> pay(@PathVariable Integer amount, @RequestParam String returnUrl) {
-        return Response.success(stripeService.pay(amount, returnUrl));
+    @PostMapping("/createOrder")
+    public Response<String> pay(@Valid @RequestBody ProductPurchaseDTO productPurchaseDTO) {
+        return Response.success(stripeService.pay(productPurchaseDTO));
     }
 
     @ApiOperation("支付通知")
     @PostMapping("/trade/notify")
-    public Response<String> callback(HttpServletRequest request) throws ServletException, IOException {
+    public void callback(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         Boolean result =  stripeService.notify(request);
         if (result){
-            return Response.success(200,"success");
+            response.setStatus(HttpServletResponse.SC_OK);
         }else {
-            return Response.fail(400,"failure");
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         }
     }
 
     @ApiOperation("申请退款")
-    @PostMapping("/trade/refund/{orderNo}/{reason}")
+    @GetMapping("/trade/refund/{orderNo}/{reason}")
     public Response<HttpResponse<Refund>> refund(@PathVariable String orderNo, @PathVariable String reason) throws IOException {
         String response = stripeService.refund(null,orderNo,reason);
         if (response.equals("退款成功")){
@@ -51,4 +59,57 @@ public class StripeController {
         }
     }
 
+    @ApiOperation("获取订阅")
+    @GetMapping("/getSubscription")
+    public Response<List<String>> getSubscription(@RequestParam String name, @RequestParam String email) {
+        try {
+            return Response.success(stripeService.getSubscriptionIds(name, email));
+        } catch (StripeException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @ApiOperation("取消订阅")
+    @GetMapping("/cancelSubscription")
+    public Response<String> cancelSubscription(@RequestParam String subscriptionId, @RequestParam(required = false) String reason) {
+        stripeService.cancelSubscription(subscriptionId, reason);
+        return Response.success("success");
+    }
+    @ApiOperation("临时 取消订阅")
+    @GetMapping("/cancelSubscriptionTemp")
+    public Response<String> cancelSubscriptionTemp(@RequestParam String subscriptionId) {
+        stripeService.cancelSubscriptionTemp(subscriptionId);
+        return Response.success("success");
+    }
+
+    @ApiOperation("创建订阅 临时")
+    @GetMapping("/createSubscriptionTemp")
+    public Response<String> createSubscriptionTemp(@RequestParam String name, @RequestParam String email) {
+        return Response.success(stripeService.createSubscriptionTemp(name, email));
+    }
+
+    @ApiOperation("修改用户默认支付方式 临时")
+    @GetMapping("/changeCustomerPayment")
+    public Response<String> changeCustomerPayment(@RequestParam String name, @RequestParam String email) {
+        return Response.success(stripeService.changeCustomerPayment(name, email));
+    }
+
+    @ApiOperation("临时 发送续订失败邮件")
+    @GetMapping("/sendRenewalFailEmail")
+    public Response<Boolean> sendRenewalFailEmail(@RequestParam String invoiceId, @RequestParam String subscriptionId, @RequestParam String orderNo) {
+        return Response.success(stripeService.sendRenewalFailEmail(invoiceId, subscriptionId,orderNo));
+    }
+
+    @ApiOperation("临时 查询指定用户绑定的付款方式")
+    @GetMapping("/getCustomerPaymentMethod")
+    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));
+    }
+
 }