Merge branch 'dev/dev_xp' into dev/dev

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

@@ -51,8 +51,17 @@ public class AffiliateController {
 
     @ApiOperation(value = "审批affiliate申请")
     @GetMapping("/approval")
-    public Response<Boolean> applicationApproval(@RequestParam("id") Long id, @RequestParam("isApproved")Boolean isApproved) {
-        return Response.success(affiliateService.applicationApproval(id, isApproved));
+    public Response<Boolean> applicationApproval(@RequestParam("id") Long id,
+                                                 @RequestParam("isApproved")Boolean isApproved,
+                                                 @RequestParam("commission") Float commission) {
+        return Response.success(affiliateService.applicationApproval(id, isApproved, commission));
+    }
+
+    @ApiOperation(value = "更新佣金比例")
+    @GetMapping("/updateCommission")
+    public Response<String> updateCommissionPercentage(@RequestParam("id") Long id, @RequestParam("commission") Float commission) {
+        affiliateService.updateCommissionPercentage(id, commission);
+        return Response.success("success");
     }
 
     /*@ApiOperation(value = "定时计算佣金")

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

@@ -141,6 +141,14 @@ public class StripeController {
                                               @RequestParam(required = false) String cooperator, @RequestParam(required = false) String remark){
         return Response.success(stripeService.updateCouponsInfo(id, paidCommission, cooperator, remark));
     }
+
+    @ApiOperation("删除推广码")
+    @GetMapping("/deletePromCode")
+    public Response<String> deleteCoupon(@RequestParam Long id){
+        stripeService.deleteCoupon(id);
+        return Response.success("success");
+    }
+
     /*@ApiOperation("临时 取消订阅")
     @GetMapping("/cancelSubscriptionTemp")
     public Response<String> cancelSubscriptionTemp(@RequestParam String subscriptionId) {