From 76cfa50e5ed92704707e38bf0a7afccc70301f78 Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Sun, 28 Jan 2024 16:24:40 +0800
Subject: [PATCH] init

---
 .../src/main/resources/application-dev.yml    | 16 ++++++------
 .../src/main/resources/application-prod.yml   | 16 ++++++------
 .../src/main/resources/application.yml        | 17 ++++++------
 .../admin/AccountCashController.java          |  4 +--
 .../controller/admin/ReportController.java    | 26 ++++++++++++++-----
 .../cai/controller/app/OtherController.java   |  4 ---
 .../java/com/ruoyi/cai/pay/OrderTypeEnum.java |  1 +
 .../ruoyi/cai/service/AccountCashService.java |  2 +-
 .../service/impl/AccountCashServiceImpl.java  |  9 ++++---
 .../cai/service/impl/AccountServiceImpl.java  |  2 --
 .../resources/mapper/cai/ReportMapper.xml     |  3 +++
 ruoyi-framework/pom.xml                       |  8 +++---
 12 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index f5a655f9..e8f8a600 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,12 +1,12 @@
 --- # 监控中心配置
-spring.boot.admin.client:
-  # 增加客户端开关
-  enabled: true
-  url: http://localhost:9090/admin
-  instance:
-    service-host-type: IP
-  username: ruoyi
-  password: 123456
+#spring.boot.admin.client:
+#  # 增加客户端开关
+#  enabled: true
+#  url: http://localhost:9090/admin
+#  instance:
+#    service-host-type: IP
+#  username: ruoyi
+#  password: 123456
 
 --- # xxl-job 配置
 xxl.job:
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 073142ff..55edbf87 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -2,14 +2,14 @@
 spring.servlet.multipart.location: /ruoyi/server/temp
 
 --- # 监控中心配置
-spring.boot.admin.client:
-  # 增加客户端开关
-  enabled: false
-  url: http://localhost:9090/admin
-  instance:
-    service-host-type: IP
-  username: ruoyi
-  password: 123456
+#spring.boot.admin.client:
+#  # 增加客户端开关
+#  enabled: false
+#  url: http://localhost:9090/admin
+#  instance:
+#    service-host-type: IP
+#  username: ruoyi
+#  password: 123456
 
 --- # xxl-job 配置
 xxl.job:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f2a02168..c214b011 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -244,11 +244,12 @@ lock4j:
 --- # Actuator 监控端点的配置项
 management:
   endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: ALWAYS
-    logfile:
-      external-file: ./logs/sys-console.log
+    enabled-by-default: false
+#    web:
+#      exposure:
+#        include: '*'
+#  endpoint:
+#    health:
+#      show-details: ALWAYS
+#    logfile:
+#      external-file: ./logs/sys-console.log
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java
index 8ab54a32..41a81423 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java
@@ -105,8 +105,8 @@ public class AccountCashController extends BaseController {
     @Log(title = "用户提现不通过", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @GetMapping("/fail")
-    public R<Void> fail(Long id) {
-        accountCashService.fail(id);
+    public R<Void> fail(Long id,String remark) {
+        accountCashService.fail(id,remark);
         return R.ok();
     }
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java
index 68113138..107513f5 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Report;
 import com.ruoyi.cai.dto.admin.vo.ReportAdminVo;
+import com.ruoyi.cai.dto.app.query.IdRes;
+import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.service.ReportService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -16,6 +18,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +39,8 @@ import java.util.Arrays;
 public class ReportController extends BaseController {
 
     private final ReportService reportService;
+    @Autowired
+    private YunxinHttpService yunxinHttpService;
 
     /**
      * 查询举报列表
@@ -59,15 +64,22 @@ public class ReportController extends BaseController {
         return R.ok(reportService.getById(id));
     }
 
-    /**
-     * 修改举报
-     */
     @SaCheckPermission("cai:report:edit")
-    @Log(title = "举报", businessType = BusinessType.UPDATE)
+    @Log(title = "举报处理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Report bo) {
-        return toAjax(reportService.updateById(bo));
+    @PutMapping("/audit/success")
+    public R<Void> edit(@RequestBody IdRes id) {
+        boolean update = reportService.update(Wrappers.lambdaUpdate(Report.class)
+                .eq(Report::getId, id.getId())
+                .eq(Report::getStatus, 0)
+                .set(Report::getStatus, 1));
+        if(update){
+            Report report = reportService.getById(id.getId());
+            if(report != null){
+                yunxinHttpService.reportSendMessage(report.getUserId());
+            }
+        }
+        return R.ok();
     }
 
     /**
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java
index 08c86a3c..ca75bca1 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java
@@ -2,7 +2,6 @@ package com.ruoyi.cai.controller.app;
 
 import com.ruoyi.cai.dto.app.query.UserReportReq;
 import com.ruoyi.cai.dto.app.query.push.PushErrorReq;
-import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.service.ReportService;
 import com.ruoyi.cai.service.UserErrorLogService;
 import com.ruoyi.common.annotation.Log;
@@ -26,8 +25,6 @@ public class OtherController {
     private ReportService reportService;
     @Autowired
     private UserErrorLogService userErrorLogService;
-    @Autowired
-    private YunxinHttpService yunxinHttpService;
 
     @PostMapping("/report")
     @Operation(summary = "举报")
@@ -36,7 +33,6 @@ public class OtherController {
         Long userId = LoginHelper.getUserId();
         reportRes.setUserId(userId);
         reportService.report(reportRes);
-        yunxinHttpService.reportSendMessage(userId);
         return R.ok();
     }
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/OrderTypeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/OrderTypeEnum.java
index 510882ae..6ab510f2 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/OrderTypeEnum.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/OrderTypeEnum.java
@@ -6,6 +6,7 @@ import lombok.Getter;
 public enum OrderTypeEnum {
     VIP_ORDER_SUB("V"),
     RECHARGE_ORDER_SUB("R"),
+    WITHDRAW_ORDER_SUB("W"),
         ;
 
     private final String type;
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountCashService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountCashService.java
index 8029f659..dda0fd3b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountCashService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountCashService.java
@@ -22,7 +22,7 @@ public interface AccountCashService extends IService<AccountCash> {
 
     Page<AccountCashAdminVo> pageAdmin(PageQuery pageQuery, AccountCashAdminVo bo);
 
-    void fail(Long id);
+    void fail(Long id,String failRemark);
 
     ExportBatchAuditVo batchAudit(List<Long> result);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java
index 6ccbc9ed..b9274a9b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java
@@ -15,6 +15,8 @@ import com.ruoyi.cai.manager.IdManager;
 import com.ruoyi.cai.mapper.AccountCashMapper;
 import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.notice.dto.CashSuccessSendMesDTO;
+import com.ruoyi.cai.pay.OrderNoUtil;
+import com.ruoyi.cai.pay.OrderTypeEnum;
 import com.ruoyi.cai.service.AccountCashService;
 import com.ruoyi.cai.service.AccountBankcardService;
 import com.ruoyi.cai.service.AccountService;
@@ -58,7 +60,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
         AccountCash cash = new AccountCash();
         cash.setUserId(res.getUserId());
         cash.setTraceId(traceId);
-        cash.setOrderNo("orderNo");
+        cash.setOrderNo(OrderNoUtil.createOrderNo(OrderTypeEnum.WITHDRAW_ORDER_SUB));
         cash.setWithdrawCoin(coinNum);
         cash.setCashMoney(BigDecimal.valueOf(withdrawExchange.getMoney()));
         cash.setRealCashMoney(BigDecimal.valueOf(withdrawExchange.getMoney()));
@@ -75,7 +77,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
     }
 
     @Override
-    public void fail(Long id) {
+    public void fail(Long id,String failRemark) {
         AccountCash accountCash = this.getById(id);
         if(accountCash == null){
             return;
@@ -84,6 +86,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
                 .set(AccountCash::getVerifyTime, LocalDateTime.now())
                 .set(AccountCash::getOperateIp, ServletUtils.getClientIP())
                 .set(AccountCash::getStatus, AccountCashStatusEnum.FAIL.getCode())
+                .set(AccountCash::getVerifyRemark,failRemark)
                 .eq(AccountCash::getStatus, AccountCashStatusEnum.READY.getCode())
                 .eq(AccountCash::getId, id));
         if(!update){
@@ -91,7 +94,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
         }
         accountService.withdrawFail(accountCash.getUserId(),accountCash.getWithdrawCoin(),accountCash.getTraceId());
         yunxinHttpService.cashFailSendMessage(accountCash.getUserId(),accountCash.getCreateTime(),accountCash.getCashMoney(),
-                accountCash.getVerifyRemark());
+                failRemark);
     }
 
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
index 0fb834e4..7ab1b89d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
@@ -1,6 +1,5 @@
 package com.ruoyi.cai.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,7 +32,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 用户账户Service业务层处理
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/ReportMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/ReportMapper.xml
index c903d100..34b0350a 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/ReportMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/ReportMapper.xml
@@ -23,6 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join cai_user t2 on t1.user_id = t2.id
         left join cai_user t3 on t1.report_uid = t3.id
         <where>
+            <if test="bo.status != null">
+                and t1.status = #{bo.status}
+            </if>
             <if test="bo.mobile != null and bo.mobile != ''">
                 and t2.mobile = #{bo.mobile}
             </if>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index b0377ee9..a6a0f2aa 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -46,15 +46,15 @@
             <artifactId>p6spy</artifactId>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.alibaba</groupId>