123

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/InnerController.java

@@ -1,25 +0,0 @@
-package com.ruoyi.web.controller.cai;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.cai.domain.AgreementSetting;
-import com.ruoyi.cai.service.AgreementSettingService;
-import com.ruoyi.common.core.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/inner")
-@SaIgnore
-public class InnerController {
-
-    @Autowired
-    private AgreementSettingService agreementSettingService;
-
-    @GetMapping("/agreement")
-    public R<AgreementSetting> report(){
-        AgreementSetting agreementSetting = agreementSettingService.getAgreementSetting();
-        return R.ok(agreementSetting);
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java

@@ -54,7 +54,7 @@ public class IndexController {
     private SystemConfigManager systemConfigManager;
 
     @GetMapping("/config")
-    @Operation(summary = "获取APP系统核心参数(无需鉴权可访问)")
+    @Operation(summary = "获取APP系统核心参数")
     @Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER, isSaveDb = false)
     @SaIgnore
     public R<AppHomeConfig> config(){
@@ -88,13 +88,13 @@ public class IndexController {
         return R.ok(home);
     }
 
-    @GetMapping("/anchor/test/page")
+    /*@GetMapping("/anchor/test/page")
     @Operation(summary = "主播测试接口",hidden = true)
     @Log(title = "主播测试接口", businessType = BusinessType.OTHER, isSaveDb = false)
     public R<List<AnchorListVo>> anchorTestPage(PageQuery page, AnchorListQuery query){
         Page<AnchorListVo> res = anchorService.pageApp(page,query);
         return R.ok(res.getRecords());
-    }
+    }*/
 
     @GetMapping("/user/page")
     @Operation(summary = "首页用户搜索接口-分页")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java

@@ -1,55 +0,0 @@
-package com.ruoyi.web.controller.cai.test;
-
-import com.ruoyi.cai.domain.RechargeOrder;
-import com.ruoyi.cai.domain.VipOrder;
-import com.ruoyi.cai.dto.app.query.order.AddRechargeOrderDto;
-import com.ruoyi.cai.dto.app.query.order.AddVipOrderDto;
-import com.ruoyi.cai.pay.PayManager;
-import com.ruoyi.cai.service.RechargeOrderService;
-import com.ruoyi.cai.service.VipOrderService;
-import com.ruoyi.common.core.domain.R;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/cai/test/pay")
-@Tag(name = "测试接口，正式环境取消")
-public class TestPayController {
-
-    @Autowired
-    private VipOrderService vipOrderService;
-    @Autowired
-    private RechargeOrderService rechargeOrderService;
-    @Autowired
-    private PayManager payManager;
-
-    @GetMapping("/vip")
-    @Operation(hidden = true)
-    public R<Void> vip(Long memberPriceId, Long userId){
-        AddVipOrderDto addVipOrderDto = new AddVipOrderDto();
-        addVipOrderDto.setUserId(userId);
-        addVipOrderDto.setMemberPriceId(memberPriceId);
-        VipOrder vipOrder = vipOrderService.addVipOrder(addVipOrderDto);
-        payManager.callBack(vipOrder.getOrderNo());
-        return R.ok();
-    }
-
-    @GetMapping("/recharge")
-    @Operation(hidden = true)
-    public R<Void> recharge(Long goodId, Long userId){
-        AddRechargeOrderDto dto = new AddRechargeOrderDto();
-        dto.setUserId(userId);
-        dto.setGoodId(goodId);
-        RechargeOrder order = rechargeOrderService.addRechargeOrder(dto);
-        payManager.callBack(order.getOrderNo());
-        return R.ok();
-    }
-}

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java

@@ -119,16 +119,18 @@ public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, Consume
                 oneUnionSend = accountService.distribution(consumer, consumer.getUnionUserId(), consumer.getUnionAmount(), changeCodeEnum);
             }
             if(oneInviteSend){ // 一级邀请
-                rankManager.sendInviteRankMq(consumer.getOneUserId(),consumer.getOneAmount(),consumer.getTraceId());
+                if(ConsumeLogType.RECHARGE.getCode().equals(consumer.getType())){ // 充值分销才上邀请榜单
+                    rankManager.sendInviteRankMq(consumer.getOneUserId(),consumer.getOneAmount(),consumer.getTraceId());
+                }
                 userInviteService.incsCoinAsync(consumer.getOneUserId(),consumer.getCreateInviteUserId(),consumer.getOneAmount());
                 if(ConsumeLogType.RECHARGE.getCode().equals(consumer.getType())){ // 充值奖励推送
                     yunxinHttpService.inviteCashbackSendMessage(consumer.getOneUserId(),consumer.getSourceUserId(),
                                 consumer.getOneRate(),consumer.getAmount(),consumer.getOneAmount());
                 }
             }
-            if(oneUnionSend){ // 工会邀请
+//            if(oneUnionSend){ // 工会邀请
-                rankManager.sendInviteRankMq(consumer.getUnionUserId(),consumer.getUnionAmount(),consumer.getTraceId());
+//                rankManager.sendInviteRankMq(consumer.getUnionUserId(),consumer.getUnionAmount(),consumer.getTraceId());
-            }
+//            }
         }catch (Exception e){
             log.error("分销发生未知错误，请联系开发检查!",e);
         }