楼上接口+商品查询修改

# Conflicts:
#	src/main/java/com/example/demo/domain/vo/Page.java

pom.xml

@@ -84,6 +84,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.6</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version> <!-- Jakarta Validation规范版本 -->
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>8.0.0.Final</version> <!-- 对应Spring Boot 3的实现版本 -->
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/example/demo/DemoApplication.java

@@ -2,8 +2,10 @@ package com.example.demo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling // 启用调度功能
 public class DemoApplication {
 
     public static void main(String[] args) {

src/main/java/com/example/demo/Util/BusinessException.java

@@ -0,0 +1,31 @@
+package com.example.demo.Util;
+
+/**
+ * @program: GOLD
+ * @ClassName BusinessException
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 14:58
+ * @Version 1.0
+ **/
+
+import lombok.Getter;
+
+/**
+ * 业务异常，可抛出到前端
+ */
+@Getter
+public class BusinessException extends RuntimeException {
+    private int code; // 业务状态码
+    // 使用默认状态码0的构造方法
+    public BusinessException(String message) {
+        this(400, message); // 默认状态码400
+    }
+
+    // 指定状态码的构造方法
+    public BusinessException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+}

src/main/java/com/example/demo/Util/RedisUtil.java

@@ -0,0 +1,190 @@
+/*
+package com.example.demo.Util;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+import java.util.Set;
+import java.util.concurrent.*;
+
+@Component
+public class RedisUtil {
+
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
+    // 线程池用于处理延迟消息
+    private ExecutorService delayMessageExecutor;
+
+    // 延迟消息处理线程数
+    private static final int DELAY_THREAD_POOL_SIZE = 4;
+
+    // 延迟队列轮询间隔(毫秒)
+    private static final long DELAY_QUEUE_POLL_INTERVAL = 1000L;
+
+    @PostConstruct
+    public void init() {
+        // 初始化线程池
+        delayMessageExecutor = Executors.newFixedThreadPool(DELAY_THREAD_POOL_SIZE);
+    }
+
+    */
+/**
+     * 发送消息到队列
+     * @param queueName 队列名称
+     * @param message 消息内容
+     *//*
+
+    public void sendMessage(String queueName, Object message) {
+        redisTemplate.opsForList().rightPush(queueName, message);
+    }
+
+    */
+/**
+     * 阻塞获取消息(优化版，增加重试机制)
+     * @param queueName 队列名称
+     * @param timeout 超时时间(秒)
+     * @return 消息内容
+     *//*
+
+    public Object blockingGetMessage(String queueName, long timeout) {
+        // 分段获取，避免长时间阻塞
+        long endTime = System.currentTimeMillis() + timeout * 1000;
+        while (System.currentTimeMillis() < endTime) {
+            Object message = redisTemplate.opsForList().leftPop(queueName, 1, TimeUnit.SECONDS);
+            if (message != null) {
+                return message;
+            }
+        }
+        return null;
+    }
+
+    */
+/**
+     * 非阻塞获取消息
+     * @param queueName 队列名称
+     * @return 消息内容
+     *//*
+
+    public Object getMessage(String queueName) {
+        return redisTemplate.opsForList().leftPop(queueName);
+    }
+
+    */
+/**
+     * 获取队列长度
+     * @param queueName 队列名称
+     * @return 队列长度
+     *//*
+
+    public Long getQueueSize(String queueName) {
+        return redisTemplate.opsForList().size(queueName);
+    }
+
+    */
+/**
+     * 发送延迟消息(优化版)
+     * @param queueName 队列名称
+     * @param message 消息内容
+     * @param delay 延迟时间(秒)
+     *//*
+
+    public void sendDelayMessage(String queueName, Object message, long delay) {
+        String delayQueueKey = getDelayQueueKey(queueName);
+        String messageId = generateMessageId();
+
+        redisTemplate.execute(new RedisCallback<Object>() {
+            @Override
+            public Object doInRedis(RedisConnection connection) {
+                connection.openPipeline();
+                // 直接存储消息内容到ZSet的value中
+                connection.zAdd(
+                        delayQueueKey.getBytes(),
+                        System.currentTimeMillis() + delay * 1000,
+                        serializeMessage(messageId, message)
+                );
+                connection.closePipeline();
+                return null;
+            }
+        });
+    }
+
+    */
+/**
+     * 启动延迟消息处理任务
+     *//*
+
+    @Scheduled(fixedRate = DELAY_QUEUE_POLL_INTERVAL)
+    public void processDelayMessages() {
+        Set<String> delayQueues = redisTemplate.keys("delay:*");
+        if (delayQueues != null) {
+            for (String delayQueue : delayQueues) {
+                delayMessageExecutor.execute(() -> {
+                    String queueName = delayQueue.substring(6); // 去掉"delay:"前缀
+                    processSingleDelayQueue(queueName);
+                });
+            }
+        }
+    }
+
+    */
+/**
+     * 处理单个延迟队列
+     *//*
+
+    private void processSingleDelayQueue(String queueName) {
+        String delayQueueKey = getDelayQueueKey(queueName);
+        long now = System.currentTimeMillis();
+
+        // 获取所有已到期的消息
+        Set<ZSetOperations.TypedTuple<Object>> messages = redisTemplate.opsForZSet()
+                .rangeByScoreWithScores(delayQueueKey, 0, now);
+
+        if (messages != null && !messages.isEmpty()) {
+            for (ZSetOperations.TypedTuple<Object> tuple : messages) {
+                Object messageWithId = tuple.getValue();
+                if (messageWithId != null) {
+                    // 反序列化消息
+                    Object message = deserializeMessage(messageWithId.toString());
+                    // 发送到实际队列
+                    sendMessage(queueName, message);
+                    // 从延迟队列中移除
+                    redisTemplate.opsForZSet().remove(delayQueueKey, messageWithId);
+                }
+            }
+        }
+    }
+
+    // 生成消息ID
+    private String generateMessageId() {
+        return java.util.UUID.randomUUID().toString();
+    }
+
+    // 获取延迟队列key
+    private String getDelayQueueKey(String queueName) {
+        return "delay:" + queueName;
+    }
+
+    // 序列化消息(可根据实际需求实现)
+    private byte[] serializeMessage(String messageId, Object message) {
+        // 这里简单实现，实际项目中可以使用JSON序列化等
+        return (messageId + ":" + message.toString()).getBytes();
+    }
+
+    // 反序列化消息(可根据实际需求实现)
+    private Object deserializeMessage(String serialized) {
+        // 简单实现，根据实际序列化方式调整
+        int separatorIndex = serialized.indexOf(':');
+        if (separatorIndex > 0) {
+            return serialized.substring(separatorIndex + 1);
+        }
+        return serialized;
+    }
+}*/

src/main/java/com/example/demo/config/RedisConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.example.demo.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,3 +45,4 @@ public class RedisConfig {
 
 
 }
+*/

src/main/java/com/example/demo/controller/AuditController.java

@@ -1,11 +1,17 @@
 package com.example.demo.controller;
 
+import com.example.demo.domain.vo.AuditRequest;
+import com.example.demo.domain.vo.Page;
+import com.example.demo.domain.vo.RechargeAudit;
+import com.example.demo.domain.vo.RefundAudit;
+import com.example.demo.service.AuditService;
+import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @program: gold-java
@@ -23,4 +29,34 @@ import org.springframework.web.bind.annotation.RestController;
 @Transactional
 @CrossOrigin
 public class AuditController {
+
+    @Autowired
+    private AuditService auditService;
+
+    //审核订单
+    @PostMapping("audit")
+    public ResponseEntity<Boolean> auditOrder(
+            @RequestBody AuditRequest request) {
+        boolean result = auditService.auditOrder(request.getToken(),request.getOrderCode(), request.getAuditId(), request.getAction(),request.getRejectReason());
+        return ResponseEntity.ok(result);
+}
+    //多条件查询充值审核订单列表
+    @PostMapping("selectRecharge")
+    public PageInfo<RechargeAudit> searchRechargeAudit(
+            @RequestBody Page page) {
+        Integer pageNum = page.getPageNum();
+        Integer pageSize = page.getPageSize();
+        RechargeAudit rechargeAudit = page.getRechargeAudit();
+
+        return auditService.selectRechargeBy(pageNum, pageSize, rechargeAudit);
+}    //多条件查询退款审核订单列表
+    @PostMapping("selectRefund")
+    public PageInfo<RefundAudit> searchRefundAudit(
+            @RequestBody Page page) {
+        Integer pageNum = page.getPageNum();
+        Integer pageSize = page.getPageSize();
+        RefundAudit refundAudit = page.getRefundAudit();
+
+        return auditService.selectRefundBy(pageNum, pageSize, refundAudit);
+}
 }

src/main/java/com/example/demo/controller/ConsumeController.java

@@ -0,0 +1,103 @@
+package com.example.demo.controller;
+
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.ConsumeUser;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.Page;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.service.ConsumeService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @program: gold-java
+ * @ClassName ConsumeController
+ * @description:消费模块
+ * @author: Double
+ * @create: 2025−06-23 13:06
+ * @Version 1.0
+ **/
+
+@RestController
+@RequestMapping("/consume")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class ConsumeController {
+
+    @Autowired
+    private ConsumeService consumeService;
+
+    //消耗明细
+    @PostMapping("/selectAll")
+    public Result selcetAll(@RequestBody Page page) {
+        try {
+            if (ObjectUtils.isEmpty(page.getPageNum())) {
+                return Result.error("页码数为空！");
+            }
+            if (ObjectUtils.isEmpty(page.getPageSize())) {
+                return Result.error("页大小为空！");
+            } else {
+                return Result.success(consumeService.selectAll(page.getPageNum(), page.getPageSize(),page.getConsumeUser()));
+            }
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+
+        }
+
+    }
+
+
+    //消耗明细筛选
+    @PostMapping("/selectBy")
+    public Result selcetBy(@RequestBody Page page) {
+        try {
+            if (ObjectUtils.isEmpty(page.getPageNum())) {
+                return Result.error("页码数为空！");
+            }
+            if (ObjectUtils.isEmpty(page.getPageSize())) {
+                return Result.error("页大小为空！");
+            } else {
+                return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsumeUser()));
+            }
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+
+    }
+
+    //消耗金币统计
+    @PostMapping("/statsGold")
+    public Result statsGold(@RequestBody ConsumeUser consumeUser) {
+        try {
+            Gold gold = consumeService.statsGold(consumeUser);
+            return Result.success(gold);
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+    }
+
+    //消耗金币增加
+    @PostMapping("/add")
+    public Result add(@RequestBody ConsumeUser consumeUser) {
+        try {
+            return consumeService.add(consumeUser);
+//            if(consumeUser.getJwcode().equals(94226013))
+//            {
+//                return consumeService.add(consumeUser);
+//            }else {
+//                return Result.error("不是测试的精网号，无法添加消费");
+//            }
+//
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+    }
+
+
+
+}

src/main/java/com/example/demo/controller/GeneralController.java

@@ -41,4 +41,16 @@ public class GeneralController {
         List<String> list = generalService.getPlatform();
         return Result.success(list);
     }
+    @PostMapping("/goods")
+    public Result getGoods()
+    {
+        List<String> list = generalService.getGoods();
+        return Result.success(list);
+    }
+    @PostMapping("/activity")
+    public Result getActivity()
+    {
+        List<String> list = generalService.getActivity();
+        return Result.success(list);
+    }
 }

src/main/java/com/example/demo/controller/GoldDetailController.java

@@ -0,0 +1,61 @@
+package com.example.demo.controller;
+
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.vo.GoldDetail;
+import com.example.demo.domain.vo.Page;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.service.GoldDetailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @program: GOLD
+ * @ClassName GoldDetailController
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 14:41
+ * @Version 1.0
+ **/
+
+@RestController
+@RequestMapping("/goldDetail")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class GoldDetailController {
+    private final GoldDetailService goldDetailService;
+    @PostMapping("/getGoldDetail")
+    public Result getGoldDetail(@RequestBody Page page){
+
+        if(ObjectUtils.isEmpty(page.getPageNum())){
+            return Result.error("页码数为空！");
+        }
+        if(ObjectUtils.isEmpty(page.getPageSize())){
+            return Result.error("页大小为空！");
+        }
+        else{
+            return Result.success(goldDetailService.getGoldDetail(page.getPageNum(), page.getPageSize(), page.getGoldDetail()));
+        }
+    }
+    @PostMapping("/getTotal")
+    public Result getTotal(@RequestBody GoldDetail goldDetail) {
+        return Result.success(goldDetailService.getTotal(goldDetail));
+    }
+    @PostMapping("/goldTotal")
+    public Result GoldTotal(@RequestBody User user) {
+        return Result.success(goldDetailService.GoldTotal(user));
+    }
+    @PostMapping("/getGold")
+    public Result getGold(@RequestBody Page  page) {
+        System.out.println( page);
+        if(ObjectUtils.isEmpty(page.getPageNum())){
+            return Result.error("页码数为空！");
+        }
+        if(ObjectUtils.isEmpty(page.getPageSize())){
+            return Result.error("页大小为空！");
+        }
+        return Result.success(goldDetailService.getGold(page.getPageNum(), page.getPageSize(), page.getUser()));
+    }
+}

src/main/java/com/example/demo/controller/PermissionController.java

@@ -0,0 +1,66 @@
+package com.example.demo.controller;
+
+import com.example.demo.domain.entity.Admin;
+import com.example.demo.domain.entity.AdminRole;
+import com.example.demo.domain.vo.Page;
+import com.example.demo.domain.vo.Permission;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.service.PermissionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * @program: GOLD
+ * @ClassName PermissionController
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-26 13:22
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("/permission")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class PermissionController {
+    private final PermissionService permissionService;
+    @PostMapping("/getposition")
+    public Result getposition(@RequestBody String token){
+        return Result.success(permissionService.getposition(token));
+    }
+    @PostMapping("/getmarket")
+    public Result getmarket(@RequestBody String token){
+        return Result.success(permissionService.getmarket(token));
+    }
+    @PostMapping("/getPermission")
+    public Result getPermission(@RequestBody Page page){
+      return Result.success(permissionService.getpermission(page.getPageNum(), page.getPageSize(), page.getPermission()));
+    }
+    @PostMapping("/addPermission")
+    public Result addPermission(@RequestBody Admin admin) throws Exception {
+        System.out.println( admin);
+        try {
+            return Result.success(permissionService.addpermission(admin));
+        }
+        catch (Exception e) {
+                log.error(Arrays.toString(e.getStackTrace()));
+                return Result.error(e.getMessage());
+        }
+    }
+    @PostMapping("/getRole")
+    public Result getRole(@RequestBody String token){
+        return Result.success(permissionService.getRole(token));
+    }
+    @PostMapping("/deleteAdmin")
+    public Result deleteAdmin(@RequestBody Admin admin){
+        return Result.success(permissionService.deleteAdmin(admin.getId()));
+    }
+    @PostMapping("/updateAdminRole")
+    public Result updateAdminRole(@RequestBody AdminRole adminrole){
+        return Result.success(permissionService.updateAdminRole(adminrole));
+    }
+
+}

src/main/java/com/example/demo/controller/RechargeController.java

@@ -0,0 +1,93 @@
+package com.example.demo.controller;
+
+import com.example.demo.domain.vo.*;
+import com.example.demo.service.ConsumeService;
+import com.example.demo.service.RechargeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @program: gold-java
+ * @ClassName RechargeController
+ * @description:
+ * @author: Double
+ * @create: 2025−06-29 13:01
+ * @Version 1.0
+ **/
+
+@RestController
+@RequestMapping("/recharge")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class RechargeController {
+
+
+    @Autowired
+    private RechargeService rechargeService;
+
+    //消耗明细
+    @PostMapping("/selectAll")
+    public Result selcetAll(@RequestBody Page page) {
+        try {
+            if (ObjectUtils.isEmpty(page.getPageNum())) {
+                return Result.error("页码数为空！");
+            }
+            if (ObjectUtils.isEmpty(page.getPageSize())) {
+                return Result.error("页大小为空！");
+            } else {
+                return Result.success(rechargeService.selectAll(page.getPageNum(), page.getPageSize(),page.getRechargeUser()));
+            }
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+
+        }
+
+    }
+
+
+    //消耗明细筛选
+    @PostMapping("/selectBy")
+    public Result selcetBy(@RequestBody Page page) {
+        try {
+            if (ObjectUtils.isEmpty(page.getPageNum())) {
+                return Result.error("页码数为空！");
+            }
+            if (ObjectUtils.isEmpty(page.getPageSize())) {
+                return Result.error("页大小为空！");
+            } else {
+                return Result.success(rechargeService.selectBy(page.getPageNum(), page.getPageSize(), page.getRechargeUser()));
+            }
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+
+    }
+
+    //消耗金币统计
+    @PostMapping("/statsGold")
+    public Result statsGold(@RequestBody RechargeUser rechargeUser) {
+        try {
+            Gold gold = rechargeService.statsGold(rechargeUser);
+            return Result.success(gold);
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+    }
+
+    //充值金币增加
+    @PostMapping("/add")
+    public Result add(@RequestBody RechargeUser rechargeUser) {
+        try {
+            return rechargeService.add(rechargeUser);
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+    }
+
+
+
+}

src/main/java/com/example/demo/controller/RefundController.java

@@ -0,0 +1,101 @@
+package com.example.demo.controller;
+
+import com.example.demo.domain.vo.*;
+import com.example.demo.service.ConsumeService;
+import com.example.demo.service.RefundService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName RefundMapper.xml
+ * @description:
+ * @author: Double
+ * @create: 2025−06-26 11:28
+ * @Version 1.0
+ **/
+
+@RestController
+@RequestMapping("/refund")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class RefundController {
+
+    @Autowired
+    private RefundService refundService;
+
+    //退款明细
+    @PostMapping("/selectAll")
+    public Result selcetAll(@RequestBody Page page) {
+        try {
+            if (ObjectUtils.isEmpty(page.getPageNum())) {
+                return Result.error("页码数为空！");
+            }
+            if (ObjectUtils.isEmpty(page.getPageSize())) {
+                return Result.error("页大小为空！");
+            } else {
+                return Result.success(refundService.selectAll(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
+            }
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+
+    }
+
+    @PostMapping("/selectBy")
+    public Result selcetBy(@RequestBody Page page) {
+        try {
+            if (ObjectUtils.isEmpty(page.getPageNum())) {
+                return Result.error("页码数为空！");
+            }
+            if (ObjectUtils.isEmpty(page.getPageSize())) {
+                return Result.error("页大小为空！");
+            } else {
+                return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
+            }
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+
+    }
+
+    @PostMapping("/statsGold")
+    public Result statsGold(@RequestBody RefundUser refundUser) {
+        try {
+            Gold gold = refundService.statsGold(refundUser);
+            return Result.success(gold);
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+    }
+
+    @PostMapping("/refundType")
+    public Result getRefundType()
+    {
+        List<String> list = refundService.getRefundType();
+        return Result.success(list);
+    }
+
+    @PostMapping("/selectGoods")
+    public Result getSelectGoods(@RequestBody RefundUser refundUser)
+    {
+        List<RefundUser> list = refundService.selectGoods(refundUser.getJwcode());
+        return Result.success(list);
+    }
+
+    //消耗金币增加
+    @PostMapping("/add")
+    public Result add(@RequestBody RefundUser refundUser) {
+        try {
+            return refundService.add(refundUser);
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+    }
+}

src/main/java/com/example/demo/controller/StatisticsController.java

@@ -1,13 +1,20 @@
 package com.example.demo.controller;
 
+import com.example.demo.domain.entity.Statistics;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.service.GeneralService;
 import com.example.demo.service.StatisticsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @program: gold-java
  * @ClassName StatisticsController
@@ -25,4 +32,25 @@ import org.springframework.web.bind.annotation.RestController;
 public class StatisticsController {
     @Autowired
     private StatisticsService statisticsService;
+    @Autowired
+    private GeneralService generalService;
+    //测试定时任务part1
+    @PostMapping("/Hourly1")
+    public void  HourlyTask1() {
+        statisticsService.runHourlyTaskPart1();
+    }
+    //测试定时任务part2
+    @PostMapping("/Hourly2")
+    public void  HourlyTask2() {
+        statisticsService.runHourlyTaskPart2();
+    }
+    //测试一周内定时任务part2
+    @PostMapping("/Daily2")
+    public void  DailyTask2() {
+        statisticsService.runDailyTaskPart2();
+    }
+
+
+
+
 }

src/main/java/com/example/demo/controller/UserController.java

@@ -0,0 +1,41 @@
+package com.example.demo.controller;
+
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.GoldUser;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.service.ConsumeService;
+import com.example.demo.service.UserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @program: gold-java
+ * @ClassName UserController
+ * @description:
+ * @author: Double
+ * @create: 2025−06-25 10:25
+ * @Version 1.0
+ **/
+
+@RestController
+@RequestMapping("/user")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    @PostMapping("/selectUser")
+    public Result selectUser(@RequestBody GoldUser user) {
+        try {
+            user = userService.selectUser(user.getJwcode().toString());
+            return Result.success(user);
+        } catch (Exception e) {
+            return Result.error("接口调用失败");
+        }
+    }
+}

src/main/java/com/example/demo/controller/WorkbenchController.java

@@ -1,12 +1,20 @@
 package com.example.demo.controller;
 
+import com.example.demo.domain.entity.Statistics;
+import com.example.demo.domain.vo.TestRequest;
 import com.example.demo.domain.vo.WorkbenchCard;
+import com.example.demo.mapper.StatisticsMapper;
+import com.example.demo.service.StatisticsService;
 import com.example.demo.service.WorkbenchService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+import java.util.Map;
+
 /**
  * @program: gold-java
  * @ClassName WorkbenchController
@@ -24,27 +32,40 @@ import org.springframework.web.bind.annotation.*;
 public class WorkbenchController {
 
     @Autowired
-    private  WorkbenchService WorkbenchService;
+    private  WorkbenchService workbenchService;
+    @Autowired
+    private StatisticsService statisticsService;
+    @Autowired
+    private StatisticsMapper statisticsMapper;
 
     /*
-    获取工作台卡片一的数据
+    获取各地区工作台卡片的数据
      */
-    @PostMapping("card1")
-    public WorkbenchCard card1(@RequestBody WorkbenchCard workbench){
-        return WorkbenchService.getCard1(workbench.getToken(),workbench.getMarket());
+    @PostMapping("getCard")
+    public ResponseEntity<WorkbenchCard> card1(@RequestBody WorkbenchCard workbench){
+        WorkbenchCard result =workbenchService.getCard(workbench.getToken());
+        return ResponseEntity.ok(result);
     }
     /*
-    获取工作台卡片二的数据
+    获取各地区工作台图表的数据
      */
-    @PostMapping("card2")
-    public WorkbenchCard card2(@RequestBody WorkbenchCard workbench){
-        return WorkbenchService.getCard2(workbench.getToken(),workbench.getMarket());
+    @PostMapping("getGraph")
+    public ResponseEntity<WorkbenchCard> graph1(@RequestBody WorkbenchCard workbench){
+        WorkbenchCard result =workbenchService.getGraph(workbench.getToken(),workbench.getStartDate(),workbench.getEndDate(),workbench.getMarkets());
+        return ResponseEntity.ok(result);
     }
     /*
-    获取工作台卡片三的数据
+    测试一段时间内的统计数据
      */
-    @PostMapping("card3")
-    public WorkbenchCard card3(@RequestBody WorkbenchCard workbench){
-        return WorkbenchService.getCard3(workbench.getToken(),workbench.getMarket());
-    }
+  /*  @PostMapping("testSum")
+    public Statistics testSum( @RequestBody TestRequest request){
+        String market = request.getMarket();
+        Date date = request.getDate();
+
+
+        //获取传入日期所在周的周一
+        Date thisWeekStart = workbenchService.getStartOfWeek(date);
+
+        return statisticsMapper.selectSumByMarketAndDate(market, thisWeekStart, date);
+    }*/
 }

src/main/java/com/example/demo/domain/entity/Admin.java

@@ -29,4 +29,5 @@ public class Admin implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime; // 更新时间
+    private Integer roleId;
 }

src/main/java/com/example/demo/domain/entity/Export.java

@@ -0,0 +1,33 @@
+package com.example.demo.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @program: GOLD
+ * @ClassName Export
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-24 16:17
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+public class Export {
+    private String token;
+    private Integer account; // 账号
+    private String url; // 文件路径
+    private String fileName; // 文件名
+    private Byte type;  // 类型
+    private Byte state; // 状态
+    private Integer dataNum; // 数据量
+    private String reason; // 失败原因
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime; // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date updateTime; // 更新时间
+}

src/main/java/com/example/demo/domain/entity/Statistics.java

@@ -2,10 +2,13 @@ package com.example.demo.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -45,8 +48,9 @@ public class Statistics implements Serializable {
     private Integer rechargeNum;    // 当日充值人数
     private Integer firstRecharge;    // 当日首充人数
     // 数据日期
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
-    private Date currentDatetime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    private LocalDate currentDatetime;
     // 创建时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;

src/main/java/com/example/demo/domain/entity/User.java

@@ -27,6 +27,7 @@ public class User implements Serializable {
     private Integer currentFreeDecember; // 当前十二月免费金币
     private Integer currentTaskGold; // 当前任务金币
     private Integer rechargeNum; // 充值次数
+    private Integer sumConsume; // 历史消费
     private Integer consumeNum; // 消费次数
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
@@ -37,4 +38,6 @@ public class User implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime; // 更新时间
+    private String sortField; //排序字段
+    private String sortOrder; //排序顺序
 }

src/main/java/com/example/demo/domain/vo/AuditRequest.java

@@ -0,0 +1,18 @@
+package com.example.demo.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuditRequest {
+    private String token;
+    private String orderCode;   //订单号
+    private Integer auditId;    //审核人id
+    private Integer action;     //操作
+    private String rejectReason;    //驳回理由
+
+
+}

src/main/java/com/example/demo/domain/vo/ConsumeUser.java

@@ -0,0 +1,50 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @program: gold-java
+ * @ClassName Consume
+ * @description: 消费明细
+ * @author: Double
+ * @create: 2025−06-23 11:53
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ConsumeUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String name; // 客户姓名
+    private Integer jwcode; // 精网号
+    private String market; // 所属地区
+    private String goodsName; // 商品名称
+    private String payPlatform; // 消费平台
+    private Integer sumGold; // 金币总数
+    private Integer permanentGold; // 永久金币
+    private Integer freeGold; // 免费金币
+    private Integer taskGold; // 任务金币
+    private String remark; // 备注
+    private Integer adminId; //提交人Id
+    private String adminName; //提交人姓名
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime; // 消费时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime; // 结束时间
+
+    private String sortField; //排序字段
+    private String sortOrder; //排序顺序
+}

src/main/java/com/example/demo/domain/vo/Gold.java

@@ -0,0 +1,26 @@
+package com.example.demo.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @program: gold-java
+ * @ClassName Gold
+ * @description: 金币信息
+ * @author: Double
+ * @create: 2025−06-23 15:53
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Gold implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Integer permanentGolds; // 永久金币总数
+    private Integer freeGolds; // 免费金币总数
+    private Integer taskGolds; // 任务金币总数
+}

src/main/java/com/example/demo/domain/vo/GoldDetail.java

@@ -0,0 +1,42 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @program: GOLD
+ * @ClassName GoldDetail
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 13:03
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+public class GoldDetail {
+    private static final long serialVersionUID = 1L;
+
+    private String token;
+    private String name;    // 名称
+    private Integer jwcode; // 精网号
+    private String market;  // 所属地区
+    private String payPlatform; // 支付平台
+    private Integer type;   // 类型
+    private Integer sumGold;    // 总金币
+    private Integer permentGold;    //永久金币
+    private Integer freeJune;   // 免费金币六月到期
+    private Integer freeDecember;   // 免费金币七月到期
+    private Integer taskGold;   // 任务金币
+    private String adminName;   //提交人
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime;   // 结束时间
+    private String sortField; //排序字段
+    private String sortOrder; //排序顺序
+
+}

src/main/java/com/example/demo/domain/vo/GoldUser.java

@@ -0,0 +1,41 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program: gold-java
+ * @ClassName ConsumeUser
+ * @description:
+ * @author: Double
+ * @create: 2025−06-24 18:30
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GoldUser {
+    private String name; // 客户姓名
+    private Integer jwcode; // 精网号
+    private String market; // 所属地区
+    private Integer NowSumGold; // 当前金币总数
+    private Integer NowPermanentGold; // 当前永久金币
+    private Integer NowFreeGold; // 当前免费金币
+    private Integer NowFreeJune; // 免费金币6月
+    private Integer NowFreeDecember; // 免费金币12月
+    private Integer NowTaskGold; // 当前任务金币
+    private Integer historySumGold; // 历史金币总数
+    private Integer historyPermanentGold; // 历史永久金币
+    private Integer historyFreeGold; // 历史免费金币
+    private Integer historyTaskGold; // 历史任务金币
+    private Integer rechargeNum; // 充值次数
+    private Integer consumeNum; // 消费次数
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
+    private Date firstRecharge; // 首充日期
+
+}

src/main/java/com/example/demo/domain/vo/Page.java

@@ -0,0 +1,30 @@
+package com.example.demo.domain.vo;
+
+import com.example.demo.domain.entity.User;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: GOLD
+ * @ClassName Page
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 16:23
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+public class Page {
+    private static final long serialVersionUID = 1L;
+
+    private Integer pageNum;
+    private Integer pageSize;
+    private GoldDetail goldDetail;
+    private ConsumeUser consumeUser;
+    private User user;
+    private RefundUser refundUser;
+    private Permission permission;
+    private RechargeAudit rechargeAudit;
+    private RefundAudit refundAudit;
+    private RechargeUser rechargeUser;
+}

src/main/java/com/example/demo/domain/vo/Permission.java

@@ -0,0 +1,27 @@
+package com.example.demo.domain.vo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: GOLD
+ * @ClassName Permission
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-26 10:54
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+public class Permission {
+    private String token;
+    private String id;
+    private String name; //姓名
+    private String account; //账号
+    private String market;  //地区
+    private String postiton; //职位
+    private String roleName; //角色
+    private String remark; //备注
+    private Integer adminStatus; //状态
+    private Integer roleId; //角色id
+}

src/main/java/com/example/demo/domain/vo/RechargeAudit.java

@@ -0,0 +1,57 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program: gold-java
+ * @ClassName RechargeAudit
+ * @description: 充值审核
+ * @author: Ethan
+ * @create: 2025−06-30 10:29
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RechargeAudit {
+    private static final long serialVersionUID = 1L;
+
+    private String name; // 客户姓名
+    private Integer jwcode; // 精网号
+    private String orderCode;   // 订单号
+    private String activity; // 活动名称
+    private String market; // 所属地区
+    private Byte refundType; // 退款类型
+    private Integer sumGold; //充值金额
+    private Integer permanentGold; // 永久金币
+    private Integer freeGold; // 免费金币
+    private Integer freeJune;   // 6月免费金币
+    private Integer freeDecember; // 12月免费金币
+    private String remark; // 备注
+    private String payModel;    //支付方式
+    private String voucher; //支付凭证
+    private Integer adminId; //提交人Id
+    private String adminName; //提交人姓名
+    private String auditStatus; //审核状态
+    private Integer auditId; //审核人Id
+    private String auditName; //审核人姓名
+    private Byte type; //类型
+    private String rejectReason; //驳回理由
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private String payTime; //支付时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime; // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime; // 结束时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date auditTime; // 审核时间
+}

src/main/java/com/example/demo/domain/vo/RechargeUser.java

@@ -0,0 +1,51 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program: gold-java
+ * @ClassName Recharge
+ * @description:
+ * @author: Double
+ * @create: 2025−06-29 13:18
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RechargeUser {
+
+    private static final long serialVersionUID = 1L;
+
+    private String name; // 客户姓名
+    private Integer jwcode; // 精网号
+    private String market; // 所属地区
+    private String activity; // 活动名称
+    private Integer rateId; // 汇率ID
+    private String rateName; // 汇率名称
+    private Integer money; // 金额[分]
+    private Integer permanentGold; // 永久金币
+    private Integer freeGold; // 免费金币
+    private String payModel; // 支付方式
+    private String payPlatform; // 支付平台
+    private String voucher; // 支付凭证
+    private String remark; // 备注
+    private Integer adminId; //提交人Id
+    private String adminName; //提交人姓名
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date payTime; // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime; // 结束时间
+
+    private String sortField; //排序字段
+    private String sortOrder; //排序顺序
+}

src/main/java/com/example/demo/domain/vo/RefundAudit.java

@@ -0,0 +1,55 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program: gold-java
+ * @ClassName RechargeAudit
+ * @description: 退款审核
+ * @author: Ethan
+ * @create: 2025−06-30 13:29
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundAudit {
+    private static final long serialVersionUID = 1L;
+    private String name; // 客户姓名
+    private Integer jwcode; // 精网号
+    private String orderCode;   // 订单号
+    private String market; // 所属地区
+    private Byte refundModel; // 退款方式-全额 部分
+    private String goodsName; // 商品名称
+    private Integer sumGold; // 退款金额
+    private Integer permanentGold; // 永久金币
+    private Integer freeGold; // 免费金币
+    private Integer freeJune;   // 6月免费金币
+    private Integer freeDecember; // 12月免费金币
+    private String remark; // 备注
+    private String payModel;    //支付方式
+    private String voucher; //支付凭证
+    private Integer adminId; //提交人Id
+    private String adminName; //提交人姓名
+    private String auditStatus; //审核状态
+    private Integer auditId; //审核人Id
+    private String auditName; //审核人姓名
+    private String rejectReason; //驳回理由
+    private Byte type;  //类型
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime; // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime; // 结束时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date auditTime; // 审核时间
+}

src/main/java/com/example/demo/domain/vo/RefundUser.java

@@ -0,0 +1,50 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program: gold-java
+ * @ClassName RefundUser
+ * @description:
+ * @author: Double
+ * @create: 2025−06-26 11:29
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundUser {
+
+    private static final long serialVersionUID = 1L;
+
+    private String orderCode; // 订单号
+    private String name; // 客户姓名
+    private Integer jwcode; // 精网号
+    private String market; // 所属地区
+    private String goodsName; // 商品名称
+    private String refundType; // 退款类型
+    private Byte refundModel; // 退款方式（0全部/1部分退款）
+    private Integer sumGold; // 金币总数
+    private Integer permanentGold; // 永久金币
+    private Integer freeGold; // 免费金币
+    private Integer taskGold; // 任务金币
+    private String remark; // 退款原因
+    private Integer adminId; //提交人Id
+    private String adminName; //提交人姓名
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime; // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime; // 结束时间
+
+    private String sortField; //排序字段
+    private String sortOrder; //排序顺序
+}

src/main/java/com/example/demo/domain/vo/Result.java

@@ -1,5 +1,6 @@
 package com.example.demo.domain.vo;
 
+import com.example.demo.Util.BusinessException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AllArgsConstructor;
@@ -8,40 +9,67 @@ import lombok.NoArgsConstructor;
 
 
 import java.io.Serializable;
+import java.util.HashMap;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 public class Result implements Serializable {
     private static final long serialVersionUID = 1L;
-    private Integer code;
-    private String msg;
-    private Object data;
+    private Integer code; // 响应码，200 代表成功；401 代表未授权
+    private String msg;   // 响应消息
+    private Object data;  // 返回的数据
 
-    public static Result success(Integer code, String msg, Object data) {
-        return new Result(code, msg, data);
+    // 成功响应（不需要给前端返回数据）
+    public static Result success() {
+        return new Result(200, "success", new HashMap<>());
     }
-    public static Result success(Integer code, Object data) {
-        return success(code, "操作成功", data);
+
+    // 查询成功响应（把查询结果作为返回数据响应给前端）
+    public static Result success(Object data) {
+        return new Result(200, "success", data);
     }
-    public static Result success(String msg, Object data) {return success(200, msg, data);}
-    public static Result success(Object data){
-        return success(200, data);
+
+    // 失败响应
+    public static Result error(String msg) {
+        return new Result(0, msg, new HashMap<>());
     }
-    public static Result success(){
-        return success(null);
+
+    // 失败响应，可以自定义错误码
+    public static Result error(int code, String msg) {
+        return new Result(code, msg, new HashMap<>());
     }
 
-    public static Result error(Integer code, String msg, Object data){
-        return new Result(code, msg, data);
+    // 成功响应，可以自定义消息和数据
+    public static Result success(String msg, HashMap<String, Object> resultData) {
+        return new Result(200, msg, resultData);  // 返回成功响应，状态码为 200
     }
-    public static Result error(Integer code, String msg){
-        return error(code, msg, null);
+
+    // 未授权响应，可以自定义错误码
+    public static Result unauthorized(int code, String msg) {
+        return new Result(code, msg, new HashMap<>());
     }
-    public static Result error(String msg){
-        return error(0, msg);
+
+    // 错误响应，状态码为200，code为401
+    public static Result unauthorized(String msg) {
+        return new Result(401, msg, new HashMap<>());
     }
 
+    //失败响应 自定义状态码 默认为500
+    public static Result error(BusinessException e) {
+        Result response = new Result();
+        // 定义默认错误码映射
+        final int defaultErrorCode = 400;
+        // 检查 getCode() 是否为 null（如果是 Integer）
+        Integer code = e.getCode();
+        if (code == null || code == 0) {
+            response.setCode(defaultErrorCode); // 默认错误码
+        } else {
+            response.setCode(code);
+        }
+        response.setMsg(e.getMessage());
+        return response;
+    }
     public String toJson() throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
         return mapper.writeValueAsString(this);

src/main/java/com/example/demo/domain/vo/TestRequest.java

@@ -0,0 +1,17 @@
+package com.example.demo.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@NoArgsConstructor
+    public  class TestRequest {
+        private String market;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date date;
+
+
+
+}

src/main/java/com/example/demo/domain/vo/Total.java

@@ -0,0 +1,25 @@
+package com.example.demo.domain.vo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: GOLD
+ * @ClassName Total
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 16:53
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+public class Total {
+    private static final long serialVersionUID = 1L;
+
+    private String token;
+    private Integer Goldtotal;
+    private Integer permanentGold;
+    private Integer freeGold;
+    private Integer taskGold;
+
+}

src/main/java/com/example/demo/domain/vo/WorkbenchCard.java

@@ -1,16 +1,18 @@
 package com.example.demo.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
  * @program: gold-java
  * @ClassName Workbench
- * @description: 工作台请求参数
+ * @description: 工作台顶层容器
  * @author: Ethan
  * @create: 2025−06-17 17:43
  * @Version 1.0
@@ -21,41 +23,12 @@ import java.util.List;
 @AllArgsConstructor
 public class WorkbenchCard implements Serializable {
     private String token;   //用户token
-    private List<String> market; // 地区
-    //  卡片一：当前金币相关
-    private Integer currentGold; // 当前金币余量
-    private Integer dailyChange; // 余量较前一天的变化
-    private Integer currentPermanent; // 永久金币余量
-    private Integer currentFreeJune; // 六月到期免费金币余量
-    private Integer currentFreeDecember; // 十二月到期免费金币余量
-    private Integer currentTask; // 任务金币余量
-    private Integer currentFree; // 免费金币余量（currentFreeJune + currentFreeDecember）
+    private List<WorkbenchMarketCard> marketCards; // 地区卡片数据
+    private List<String> markets; // 地区列表
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startDate; // 起始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endDate;   // 结束时间
 
-    //  卡片二：充值相关
-    private Integer recharge; // 当日充值金币数
-    private Integer money; // 当日金额（永久金币）
-    private Integer yearlyRecharge; // 全年累计充值金币数
-    private Integer yearlyMoney; // 全年累计金额
-
-    //  卡片三：当日消费/退款/消耗相关
-    private Integer consumePermanent; // 当日新增消费（永久）
-    private Integer consumeFreeJune; // 当日新增消费（六月免费）
-    private Integer consumeFreeDecember; // 当日新增消费（十二月免费）
-    private Integer consumeTask; // 当日新增消费（任务）
-    private Integer refundPermanent; // 当日新增退款（永久）
-    private Integer refundFreeJune; // 当日新增退款（六月免费）
-    private Integer refundFreeDecember; // 当日新增退款（十二月免费）
-    private Integer refundTask; // 当日新增退款（任务）
-    private Integer dailyConsume; // 当日总消耗 = consumePermanent + consumeFreeJune + consumeFreeDecember + consumeTask - (refundPermanent + refundFreeJune + refundFreeDecember + refundTask)
-    private Integer yearlyConsume; // 全年累计消费
-    private Integer yearlyRefund; // 全年累计退款金币数
-    private Integer yearlyReduce; // 全年累计消耗金币数 = yearlyConsume - yearlyRefund
-
-    //  卡片四：人头数相关
-    private Integer rechargeNum; // 当日充值人数
-    private Integer firstRecharge; // 当日首充人数
-    private Integer wow; // 周同比（%）
-    private Integer daily; // 日环比（%）
-    private Integer yearlyRechargeNum; // 全年累计充值人头数
 
 }

src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java

@@ -0,0 +1,65 @@
+package com.example.demo.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @program: gold-java
+ * @ClassName WorkbenchMarketCard
+ * @description:
+ * @author: Ethan
+ * @create: 2025−06-25 16:20
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkbenchMarketCard implements Serializable {
+
+    private String market;//地区
+    //  卡片一：当前金币相关
+    private Integer currentGold; // 当前金币余量
+    private Integer dailyChange; // 余量较前一天的变化
+    private Integer currentPermanent; // 永久金币余量
+    private Integer currentFreeJune; // 六月到期免费金币余量
+    private Integer currentFreeDecember; // 十二月到期免费金币余量
+    private Integer currentTask; // 任务金币余量
+    private Integer currentFree; // 免费金币余量（currentFreeJune + currentFreeDecember）
+
+    //  卡片二：充值相关
+    private Integer recharge; // 当日充值金币数
+    private Integer money; // 当日金额（永久金币）
+    private Integer yearlyRecharge; // 全年累计充值金币数
+    private Integer yearlyMoney; // 全年累计金额
+
+    //  卡片三：当日消费/退款/消耗相关
+    private Integer consumePermanent; // 当日新增消费（永久）
+    private Integer consumeFreeJune; // 当日新增消费（六月免费）
+    private Integer consumeFreeDecember; // 当日新增消费（十二月免费）
+    private Integer consumeTask; // 当日新增消费（任务）
+    private Integer refundPermanent; // 当日新增退款（永久）
+    private Integer refundFreeJune; // 当日新增退款（六月免费）
+    private Integer refundFreeDecember; // 当日新增退款（十二月免费）
+    private Integer refundTask; // 当日新增退款（任务）
+    private Integer dailyReduce; // 当日总消耗 = consumePermanent + consumeFreeJune + consumeFreeDecember + consumeTask - (refundPermanent + refundFreeJune + refundFreeDecember + refundTask)
+    private Integer yearlyConsume; // 全年累计消费
+    private Integer yearlyRefund; // 全年累计退款金币数
+    private Integer yearlyReduce; // 全年累计消耗金币数 = yearlyConsume - yearlyRefund
+
+    //  卡片四：人头数相关
+    private Integer rechargeNum; // 当日充值人数
+    private Integer firstRecharge; // 当日首充人数
+    private Integer wow; // 周同比（%）
+    private Integer daily; // 日环比（%）
+    private Integer yearlyRechargeNum; // 全年累计充值人头数
+    //图表
+    private Integer SumRechargePermanent; //合计充值永久金币
+    private Integer SumRechargeFree; //合计充值免费金币
+    private Integer SumConsumePermanent; //合计消费永久金币
+    private Integer SumConsumeFree; //合计消费免费金币
+    private Integer SumConsumeTask; //合计消费任务金币
+}

src/main/java/com/example/demo/mapper/AdminMapper.java

@@ -0,0 +1,17 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.Admin;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @program: GOLD
+ * @ClassName AdminMapper
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-27 17:21
+ * @Version 1.0
+ **/
+@Mapper
+public interface AdminMapper {
+    Admin getAdmin(String  account);
+}

src/main/java/com/example/demo/mapper/AuditMapper.java

@@ -1,6 +1,14 @@
 package com.example.demo.mapper;
 
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.RechargeAudit;
+import com.example.demo.domain.vo.RefundAudit;
+import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @program: gold-java
@@ -13,6 +21,21 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface AuditMapper {
-
+    //根据订单号查订单
+    UserGoldRecord selectOrderByOrderCode(String orderCode);
+    //修改订单审核人与审核状态
+    int updateOrder (UserGoldRecord userGoldRecord);
+    //修改用户余额
+    int updateUserGold(User user);
+    //修改消费订单为以退款
+    int updateOrderRefund(String orderCode);
+    //多条件查询充值审核订单
+    List<RechargeAudit> selectRechargeBy(@Param("pageNum") Integer pageNum,
+                                 @Param("pageSize") Integer pageSize,
+                                 @Param("rechargeAudit") RechargeAudit rechargeAudit);
+    //多条件查询消费审核订单
+    List<RefundAudit> selectRefundBy(@Param("pageNum") Integer pageNum,
+                                 @Param("pageSize") Integer pageSize,
+                                 @Param("refundAudit") RefundAudit refundAudit);
 
 }

src/main/java/com/example/demo/mapper/ConsumeMapper.java

@@ -0,0 +1,26 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.ConsumeUser;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName ConsumeMapper
+ * @description:
+ * @author: Double
+ * @create: 2025−06-23 13:45
+ * @Version 1.0
+ **/
+
+@Mapper
+public interface ConsumeMapper {
+
+     List<ConsumeUser> selectAll(ConsumeUser consumeUser);
+
+     List<ConsumeUser> selectBy(ConsumeUser consumeUser);
+
+     void add(UserGoldRecord userGoldRecord);
+}

src/main/java/com/example/demo/mapper/GeneralMapper.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface GeneralMapper {
     List<String> getMarket();
     List<String> getPlatform();
+    List<String> getGoods();
+    List<String> getActivity();
 }

src/main/java/com/example/demo/mapper/GoldDetailMapper.java

@@ -0,0 +1,25 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.vo.GoldDetail;
+import com.example.demo.domain.vo.Total;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @program: GOLD
+ * @ClassName GoldDetailMapper
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 13:47
+ * @Version 1.0
+ **/
+@Mapper
+public interface GoldDetailMapper {
+    List<GoldDetail> getGoldDetail(GoldDetail goldDetail);
+    Total getTotal(GoldDetail goldDetail);
+
+    List<User> getGold(User user);
+    Total GoldTotal(User user);
+}

src/main/java/com/example/demo/mapper/PermissionMapper.java

@@ -0,0 +1,31 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.Admin;
+import com.example.demo.domain.entity.AdminRole;
+import com.example.demo.domain.entity.Role;
+import com.example.demo.domain.vo.Permission;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @program: GOLD
+ * @ClassName PermissionMapper
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-26 11:25
+ * @Version 1.0
+ **/
+@Mapper
+public interface PermissionMapper {
+    List<String> getposition(String token);
+    List<String> getmarket(String token);
+    List<Permission> getPermission(Permission permission);
+    Integer updatePermission(Admin admin);
+    Integer addPermission(Admin admin);
+    List<Role> getRole(String token);
+    Integer addadminRole(AdminRole adminRole);
+    Integer deleteAdmin(Integer id);
+    Integer deleteAdminRole(Integer id);
+    Integer updateAdminRole(AdminRole adminRole);
+}

src/main/java/com/example/demo/mapper/RechargeMapper.java

@@ -0,0 +1,27 @@
+package com.example.demo.mapper;
+
+
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.RechargeUser;
+import com.example.demo.domain.vo.RefundUser;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName RechargeMapper
+ * @description:
+ * @author: Double
+ * @create: 2025−06-29 13:41
+ * @Version 1.0
+ **/
+
+@Mapper
+public interface RechargeMapper {
+    List<RechargeUser> selectAll(RechargeUser rechargeUser);
+
+    List<RechargeUser> selectBy(RechargeUser rechargeUser);
+
+    void add(UserGoldRecord userGoldRecord);
+}

src/main/java/com/example/demo/mapper/RefundMapper.java

@@ -0,0 +1,32 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.ConsumeUser;
+import com.example.demo.domain.vo.RefundUser;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName RefundMapper
+ * @description:
+ * @author: Double
+ * @create: 2025−06-27 11:31
+ * @Version 1.0
+ **/
+
+@Mapper
+public interface RefundMapper {
+
+    List<RefundUser> selectAll(RefundUser refundUser);
+
+    List<RefundUser> selectBy(RefundUser refundUser);
+
+    void add(UserGoldRecord userGoldRecord);
+
+    List<String> getRefundType();
+
+    List<RefundUser> selectGoods(Integer jwcode);
+
+}

src/main/java/com/example/demo/mapper/StatisticsMapper.java

@@ -0,0 +1,62 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.Statistics;
+import com.example.demo.domain.entity.UserGoldRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName StatisticsMapper
+ * @description:
+ * @author: Ethan
+ * @create: 2025−06-23 14:08
+ * @Version 1.0
+ **/
+
+@Mapper
+public interface StatisticsMapper {
+    //根据地区、审核状态、起止时间查询订单表数据
+    List<UserGoldRecord> findByMarketAndAuditStatus(@Param("market") String market,
+                                                    @Param("auditStatusList") List<Integer> auditStatusList,
+                                                    @Param("startTime") Date startTime,
+                                                    @Param("endTime") Date endTime);
+    //获取某地区当前永久金币余量
+    Integer sumCurrentPermanentGold(@Param("market") String market);
+    //获取某地区当前六月免费金币余量
+    Integer sumCurrentFreeJune(@Param("market") String market);
+    //获取某地区当前永久金币余量
+    Integer sumCurrentFreeDecember(@Param("market") String market);
+    //获取某地区当前永久金币余量
+    Integer sumCurrentTaskGold(@Param("market") String market);
+    //计算该天充值人数
+    Integer  countRechargeNum(
+             @Param("market") String market,
+             @Param("startTime") Date startTime,
+             @Param("endTime") Date endTime);
+     //计算该天首充人数
+     Integer  countFirstRecharge(
+            @Param("market") String market,
+            @Param("startTime") Date startTime,
+            @Param("endTime") Date endTime);
+    //新增part1统计数据
+    void insertPart1(Statistics statistics);
+    //更新part1统计数据
+    void updatePart1(Statistics statistics);
+    //新增part2统计数据
+    void insertPart2(Statistics statistics);
+    //更新part2统计数据
+    void updatePart2(Statistics statistics);
+    //获取某地区某时间所在日期的数据（仅一条）
+    Statistics selectByMarketAndDate(@Param("market") String market,
+                                        @Param("startDate") Date startDate,
+                                        @Param("endDate") Date endDate);
+    //获取某地区某时间段的统计数据（仅一条）
+    Statistics selectSumByMarketAndDate(@Param("market") String market,
+                                     @Param("startDate") Date startDate,
+                                     @Param("endDate") Date endDate);
+}

src/main/java/com/example/demo/mapper/UserMapper.java

@@ -0,0 +1,25 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.GoldUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @program: gold-java
+ * @ClassName UserMapper
+ * @description:
+ * @author: Double
+ * @create: 2025−06-25 10:40
+ * @Version 1.0
+ **/
+
+@Mapper
+public interface UserMapper {
+
+    GoldUser selectUser(String jwcode);
+
+    GoldUser selectGold(String jwcode);
+
+    void updateGold(User user);
+}

src/main/java/com/example/demo/mapper/WorkBenchMapper.java

@@ -3,6 +3,7 @@ package com.example.demo.mapper;
 import com.example.demo.domain.vo.WorkbenchCard;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,10 +17,20 @@ import java.util.List;
 
 @Mapper
 public interface WorkBenchMapper {
-    //工作台卡片一
-    public WorkbenchCard getCard1(List<String> areas);
-    //工作台卡片二
-    public WorkbenchCard getCard2(List<String> areas);
-    //工作台卡片三
-    public WorkbenchCard getCard3(List<String> areas);
+    //给定时间范围内的该地区充值金币数（永久+免费）
+    Integer sumRecharge(String market, Date startDate, Date endDate);
+    //给定时间范围内的该地区充值金额（永久金币数）
+    Integer sumMoney(String market, Date startDate, Date endDate);
+    //给定时间范围内的该地区消费金币数（永久+免费+任务）
+    Integer sumConsume(String market, Date startDate, Date endDate);
+    //给定时间范围内的该地区消费永久金币数
+    Integer sumCPermanent(String market, Date startDate, Date endDate);
+    //给定时间范围内的该地区消费免费金币数
+    Integer sumCFree(String market, Date startDate, Date endDate);
+    //给定时间范围内的该地区消费任务金币数
+    Integer sumCTask(String market, Date startDate, Date endDate);
+    //给定时间范围内的该地区退款金币数（永久+免费+任务）
+    Integer sumRefund(String market,Date startDate, Date endDate);
+    //给定时间范围内的该地区充值人头数（根据精网号去重，老数据有多人共用一个精网号的问题）
+    Integer countRechargeNum(String market, Date startDate, Date endDate);
 }

src/main/java/com/example/demo/security/TokenFilter.java

@@ -228,8 +228,8 @@ public class TokenFilter extends OncePerRequestFilter {
         // 检查是否是上传请求
         boolean isErpRequest = request.getRequestURI().startsWith("/ERP") || request.getRequestURI().contains("ERP");
         boolean isUploadRequest = request.getRequestURI().startsWith("/upload");
-        System.out.println(request.getRequestURI());
-        System.out.println(isUploadRequest);
+//        System.out.println(request.getRequestURI());
+//        System.out.println(isUploadRequest);
         if (isUploadRequest ) {
             // 如果是上传请求，直接将请求传递给下一个过滤器或目标资源
             filterChain.doFilter(request, response);
@@ -237,7 +237,7 @@ public class TokenFilter extends OncePerRequestFilter {
         } else {
             // 使用RequestWrapper包装原始的HttpServletRequest，使其输入流可以被重复读取
             RequestWrapper requestWrapper = new RequestWrapper(request);
-            System.out.println(request);
+//            System.out.println(request);
 
             // 确保请求体只被读取一次
             boolean hasRequestBody = "POST".equals(requestWrapper.getMethod());

src/main/java/com/example/demo/service/AuditService.java

@@ -1,5 +1,10 @@
 package com.example.demo.service;
 
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.RechargeAudit;
+import com.example.demo.domain.vo.RefundAudit;
+import com.github.pagehelper.PageInfo;
+
 /**
  * @program: gold-java
  * @ClassName AuditService
@@ -11,4 +16,12 @@ package com.example.demo.service;
 
 
 public interface AuditService {
+    //审核订单并修改用户余额等
+    boolean auditOrder(String token, String orderCode, Integer auditId,Integer action,String rejectReason);
+    //多条件查询充值审核订单
+    PageInfo<RechargeAudit> selectRechargeBy(Integer pageNum, Integer pageSize, RechargeAudit rechargeAudit);
+    //多条件查询退款审核订单
+    PageInfo<RefundAudit> selectRefundBy(Integer pageNum, Integer pageSize, RefundAudit refundAudit);
+    //金币合计数
+    Gold sumRechargeGold();
 }

src/main/java/com/example/demo/service/ConsumeService.java

@@ -0,0 +1,28 @@
+package com.example.demo.service;
+
+
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.ConsumeUser;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.Result;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @program: gold-java
+ * @ClassName ConsumeService
+ * @description: 消费模块
+ * @author: Double
+ * @create: 2025−06-23 13:58
+ * @Version 1.0
+ **/
+
+public interface ConsumeService {
+
+    PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser);
+
+    Gold statsGold(ConsumeUser consumeUser);
+
+    PageInfo<ConsumeUser> selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser);
+
+    Result add(ConsumeUser consumeUser);
+}

src/main/java/com/example/demo/service/GeneralService.java

@@ -1,5 +1,9 @@
 package com.example.demo.service;
 
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -12,6 +16,21 @@ import java.util.List;
  **/
 
 public interface GeneralService {
+    //获取所有市场（地区）
     List<String> getMarket();
+    //获取平台
     List<String> getPlatform();
+    //获取商品
+    List<String> getGoods();
+    //获取活动
+    List<String> getActivity();
+    //获取昨天的日期
+    Date getYesterday();
+    //获取某天的开始时间(00:00:00)
+    Date getStartOfDay(Date date);
+    //转换日期格式为yyyy-MM-dd
+    String formatDate(Date date) ;
+    //获取时间段内的所有日期（包含起始和结束日）
+    List<Date> getAllDatesBetween(Date start, Date end);
+
 }

src/main/java/com/example/demo/service/GoldDetailService.java

@@ -0,0 +1,22 @@
+package com.example.demo.service;
+
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.vo.GoldDetail;
+import com.example.demo.domain.vo.Total;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @program: GOLD
+ * @ClassName GoldDetailService
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 11:59
+ * @Version 1.0
+ **/
+public interface GoldDetailService {
+    PageInfo<GoldDetail> getGoldDetail(Integer pageNum, Integer pageSize, GoldDetail goldDetail);
+    Total getTotal(GoldDetail goldDetail);
+
+    PageInfo<User> getGold(Integer pageNum, Integer pageSize, User user);
+    Total GoldTotal(User user);
+}

src/main/java/com/example/demo/service/PermissionService.java

@@ -0,0 +1,29 @@
+package com.example.demo.service;
+
+import com.example.demo.domain.entity.Admin;
+import com.example.demo.domain.entity.AdminRole;
+import com.example.demo.domain.entity.Role;
+import com.example.demo.domain.vo.Page;
+import com.example.demo.domain.vo.Permission;
+import com.github.pagehelper.PageInfo;
+
+import javax.swing.*;
+import java.util.List;
+
+/**
+ * @program: GOLD
+ * @ClassName PermissionService
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-26 13:18
+ * @Version 1.0
+ **/
+public interface PermissionService {
+    List<String> getposition(String token);
+    List<String> getmarket(String token);
+    PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission);
+    Integer addpermission(Admin admin) throws Exception;
+    List<Role> getRole(String token);
+    Integer deleteAdmin(Integer id);
+    Integer updateAdminRole(AdminRole adminRole);
+}

src/main/java/com/example/demo/service/RechargeService.java

@@ -0,0 +1,26 @@
+package com.example.demo.service;
+
+import com.example.demo.domain.vo.ConsumeUser;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.RechargeUser;
+import com.example.demo.domain.vo.Result;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @program: gold-java
+ * @ClassName RechargeService
+ * @description:
+ * @author: Double
+ * @create: 2025−06-29 13:39
+ * @Version 1.0
+ **/
+
+public interface RechargeService {
+    PageInfo<RechargeUser> selectAll(Integer pageNum, Integer pageSize, RechargeUser rechargeUser);
+
+    Gold statsGold(RechargeUser rechargeUser);
+
+    PageInfo<RechargeUser> selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser);
+
+    Result add(RechargeUser rechargeUser);
+}

src/main/java/com/example/demo/service/RefundService.java

@@ -0,0 +1,35 @@
+package com.example.demo.service;
+
+
+import com.example.demo.domain.vo.ConsumeUser;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.RefundUser;
+import com.example.demo.domain.vo.Result;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName RefundService
+ * @description:
+ * @author: Double
+ * @create: 2025−06-27 11:50
+ * @Version 1.0
+ **/
+
+public interface RefundService {
+
+    PageInfo<RefundUser> selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser);
+
+    Gold statsGold(RefundUser refundUser);
+
+    PageInfo<RefundUser> selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser);
+
+    Result add(RefundUser refundUser);
+
+    //获取退款类型
+    List<String> getRefundType();
+
+    List<RefundUser> selectGoods(Integer jwcode);
+}

src/main/java/com/example/demo/service/StatisticsService.java

@@ -1,5 +1,9 @@
 package com.example.demo.service;
 
+import com.example.demo.domain.entity.Statistics;
+
+import java.util.Date;
+
 /**
  * @program: gold-java
  * @ClassName StatisticsService
@@ -11,4 +15,22 @@ package com.example.demo.service;
 
 
 public interface StatisticsService {
+    //12点，18点,23点30分执行定时任务更新当天part2数据
+    public void runHourlyTaskPart1();
+    //12点，18点执行定时任务更新当天part2数据
+    public void runHourlyTaskPart2();
+    //0点执行定时任务更新近一周part2数据
+    public void runDailyTaskPart2();
+    //查询某地区某天是否已存在统计数据
+    public Statistics getExistStatistics(String market,Date date);
+
+    //新增或更新或不修改某地区某天part1统计数据
+    public void saveStatisticsPart1(String market, Date date);
+    //新增或更新或不修改某地区某天part2统计数据
+    public void saveStatisticsPart2(String market, Date date);
+    //根据地区与日期获取part1(余量属性)统计数据
+    public Statistics getStatisticsPart1(String market, Date date);
+    //根据地区与日期获取part2(余量外属性)统计数据
+    public Statistics getStatisticsPart2(String market, Date date);
+
 }

src/main/java/com/example/demo/service/UserService.java

@@ -0,0 +1,19 @@
+package com.example.demo.service;
+
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.GoldUser;
+
+/**
+ * @program: gold-java
+ * @ClassName UserService
+ * @description:
+ * @author: Double
+ * @create: 2025−06-25 10:30
+ * @Version 1.0
+ **/
+
+public interface UserService {
+
+    GoldUser selectUser(String jwcode);
+    GoldUser selectgold(String jwcode);
+}

src/main/java/com/example/demo/service/WorkbenchService.java

@@ -1,7 +1,9 @@
 package com.example.demo.service;
 
 import com.example.demo.domain.vo.WorkbenchCard;
+import com.example.demo.domain.vo.WorkbenchMarketCard;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,7 +17,18 @@ import java.util.List;
 
 
 public interface WorkbenchService {
-    WorkbenchCard getCard1(String token, List<String>areas);
-    WorkbenchCard getCard2(String token, List<String>areas);
-    WorkbenchCard getCard3(String token, List<String>areas);
+    //获取不同地区的工作台统计卡片
+     WorkbenchCard getCard(String token);
+    //获取不同地区的工作台柱状图数据（根据类型，起止时间，地区查询）
+    WorkbenchCard getGraph(String token, Date startDate, Date endDate, List<String> markets);
+    //根据类型获取年初至今的统计数据
+    Integer calculateSum(String market, String type, Date startDate,Date endDate);
+    //获取该日期该市场的日同比
+    Integer calculateDayOverDay(String market,Date date);
+    //获取该日期该市场的周环比
+    Integer calculateWeekOverWeek(String market, Date date);
+    //获取与传入的日期相差XX天的日期
+    Date addDays(Date date, int days);
+    //获取传入时间所在周的第一天（周一）
+    Date getStartOfWeek(Date date);
 }

src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@@ -1,6 +1,18 @@
 package com.example.demo.serviceImpl;
 
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.RechargeAudit;
+import com.example.demo.domain.vo.RefundAudit;
+import com.example.demo.mapper.AuditMapper;
 import com.example.demo.service.AuditService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * @program: gold-java
@@ -11,6 +23,96 @@ import com.example.demo.service.AuditService;
  * @Version 1.0
  **/
 
-
+@Service
 public class AuditServiceImpl implements AuditService {
+    @Autowired
+    private AuditMapper auditMapper;
+    /*
+    审核订单并修改用户余额等
+     */
+    @Override
+    public boolean auditOrder(String token, String orderCode, Integer auditId, Integer action,String rejectReason) {
+        UserGoldRecord order=auditMapper.selectOrderByOrderCode(orderCode);
+        if (order == null || order.getAuditStatus() != 0) {
+            throw new IllegalArgumentException("订单不存在或已被审核");
+        }
+        //更新订单的审核状态和审核人
+        UserGoldRecord updateOrder = new UserGoldRecord();
+        updateOrder.setOrderCode(orderCode);
+        updateOrder.setAuditId(auditId);
+        //判断是通过还是驳回
+        if (action==2){     //驳回
+            updateOrder.setAuditStatus(2);
+            updateOrder.setRejectReason(rejectReason);
+            auditMapper.updateOrder(updateOrder);
+            return true;
+        }else if (action==1) {    //通过
+            updateOrder.setAuditStatus(1);
+        }
+        // 执行审核更新
+        auditMapper.updateOrder(updateOrder);
+        //判断是充值还是退款
+        if (order.getType()==0){    //充值
+            //更新用户余额
+            User update = new User();
+            update.setJwcode(order.getJwcode());   //精网号
+            update.setSumPermanentGold(order.getPermanentGold());   //历史永久金币
+            update.setSumFreeJune(order.getFreeJune()); //历史六月免费金币
+            update.setSumFreeDecember(order.getFreeDecember()); //历史十二月免费金币
+            update.setSumTaskGold(order.getTaskGold()); //历史任务金币
+            update.setCurrentPermanentGold(order.getPermanentGold()); //当前永久金币
+            update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币
+            update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币
+            update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币
+            auditMapper.updateUserGold(update);
+        }else if (order.getType()==2) {  //退款
+            //1.更新用户余额,并标记对应的消费订单为已退款
+            User update = new User();
+            update.setJwcode(order.getJwcode());
+            update.setCurrentPermanentGold(order.getPermanentGold()); //当前永久金币
+            update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币
+            update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币
+            update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币
+            auditMapper.updateUserGold(update);
+            //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单）
+            String consumeOrderCode = order.getOrderCode().replaceFirst("TK", "");
+            //3.更新消费订单是否已退款状态为1
+            UserGoldRecord consumeOrder = auditMapper.selectOrderByOrderCode(consumeOrderCode);
+            if (consumeOrderCode != null&&consumeOrder.getType()==1){   //确保是消费订单
+                auditMapper.updateOrderRefund(consumeOrderCode);
+            }else {
+                throw new IllegalArgumentException("找不到对应的订单或不是有效订单");
+            }
+        }
+        return true;
+     }
+    /*
+     * 多条件查询充值订单列表
+     */
+    @Override
+    public PageInfo<RechargeAudit> selectRechargeBy(Integer pageNum, Integer pageSize, RechargeAudit rechargeAudit) {
+        PageHelper.startPage(pageNum, pageSize);
+
+        List<RechargeAudit> rechargeAudits = auditMapper.selectRechargeBy(pageNum, pageSize, rechargeAudit);
+        return new PageInfo<>(rechargeAudits);
+    }
+
+    @Override
+    public PageInfo<RefundAudit> selectRefundBy(Integer pageNum, Integer pageSize, RefundAudit refundAudit) {
+        PageHelper.startPage(pageNum, pageSize);
+
+        List<RefundAudit> refundAudits = auditMapper.selectRefundBy(pageNum, pageSize, refundAudit);
+
+        return new PageInfo<>(refundAudits);
+    }
+    /*
+    金币合计数
+     */
+    @Override
+    public Gold sumRechargeGold() {
+        Gold gold = new Gold();
+        //获取充值审核订单列表
+        List<RechargeAudit> rechargeAudits = auditMapper.selectRechargeBy(1, 1000, null);
+        return null;
+    }
 }

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -0,0 +1,169 @@
+package com.example.demo.serviceImpl;
+
+import com.example.demo.Util.GoldTistV2;
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.ConsumeUser;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.GoldUser;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.mapper.ConsumeMapper;
+import com.example.demo.mapper.UserMapper;
+import com.example.demo.service.ConsumeService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @program: gold-java
+ * @ClassName ConsumeServiceImpl
+ * @description: 消费模块
+ * @author: Double
+ * @create: 2025−06-23 13:58
+ * @Version 1.0
+ **/
+
+@Service
+public class ConsumeServiceImpl implements ConsumeService {
+
+    @Autowired
+    private ConsumeMapper consumeMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    //消耗明细
+    @Override
+    public PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<ConsumeUser> consumeUsers = consumeMapper.selectAll(consumeUser);
+        return new PageInfo<>(consumeUsers);
+    }
+
+    //消耗金币统计
+    @Override
+    public Gold statsGold(ConsumeUser consumeUser) {
+        Gold gold = new Gold();
+        List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);
+
+        // 初始化累加器
+        int permanentGoldSum = 0;
+        int freeGoldSum = 0;
+        int taskGoldSum = 0;
+
+        // 遍历消费记录并累加金币
+        for (ConsumeUser user : consumeUsers) {
+            // 累加永久金币
+            if (user.getPermanentGold() != null) {
+                permanentGoldSum += user.getPermanentGold();
+            }
+            // 累加免费金币
+            if (user.getFreeGold() != null) {
+                freeGoldSum += user.getFreeGold();
+            }
+            // 累加任务金币
+            if (user.getTaskGold() != null) {
+                taskGoldSum += user.getTaskGold();
+            }
+        }
+
+        // 将累加结果设置到Gold对象
+        gold.setPermanentGolds(permanentGoldSum);
+        gold.setFreeGolds(freeGoldSum);
+        gold.setTaskGolds(taskGoldSum);
+
+        return gold;
+    }
+
+    //消耗明细筛选
+    @Override
+    public PageInfo<ConsumeUser> selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);
+        return new PageInfo<>(consumeUsers);
+    }
+
+    //新增消耗
+    @Override
+    public Result add(ConsumeUser consumeUser) {
+        UserGoldRecord userGoldRecord = new UserGoldRecord();
+
+        // 获取当前时间戳部分
+        String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+
+        // 获取自增计数器部分（三位数，不足补零）
+        AtomicInteger atomicInteger = new AtomicInteger(0);
+
+        int count = atomicInteger.getAndUpdate(c -> (c >= 999) ? 0 : c + 1);
+        String counterPart = String.format("%03d", count);
+
+
+        //订单号生成
+        userGoldRecord.setOrderCode("XF" + timestampPart + counterPart);
+        userGoldRecord.setJwcode(consumeUser.getJwcode());
+        userGoldRecord.setGoodsName(consumeUser.getGoodsName());
+        userGoldRecord.setSumGold(consumeUser.getSumGold());
+        userGoldRecord.setPermanentGold(consumeUser.getPermanentGold());
+        // 获取当前月份（1-12）
+        int currentMonth = LocalDate.now().getMonthValue();
+        GoldUser gold = userMapper.selectGold(consumeUser.getJwcode().toString());
+        if (consumeUser.getFreeGold() > (gold.getNowFreeDecember() + gold.getNowFreeJune()) || consumeUser.getPermanentGold() > gold.getNowPermanentGold()
+                || consumeUser.getTaskGold() > gold.getNowTaskGold()) {
+            return Result.error("金币数量不足");
+        }
+        // 根据当前月份设置对应字段
+        if (currentMonth >= 1 && currentMonth <= 6) {
+            // 1-6月：设置6月额度，12月保持默认值
+            if (consumeUser.getFreeGold() > gold.getNowFreeJune()) {
+                userGoldRecord.setFreeJune(gold.getNowFreeJune());
+                userGoldRecord.setFreeDecember(consumeUser.getFreeGold() - gold.getNowFreeJune());
+            } else {
+                userGoldRecord.setFreeJune(consumeUser.getFreeGold());
+                userGoldRecord.setFreeDecember(0);
+            }
+        } else {
+            // 7-12月：设置12月额度，6月保持默认值
+            if (consumeUser.getFreeGold() > gold.getNowFreeDecember()) {
+                userGoldRecord.setFreeDecember(gold.getNowFreeDecember());
+                userGoldRecord.setFreeJune(consumeUser.getFreeGold() - gold.getNowFreeDecember());
+            } else {
+                userGoldRecord.setFreeDecember(consumeUser.getFreeGold());
+                userGoldRecord.setFreeJune(0);
+            }
+        }
+        userGoldRecord.setTaskGold(consumeUser.getTaskGold());
+        userGoldRecord.setRemark(consumeUser.getRemark());
+        userGoldRecord.setType((byte) 1);
+        userGoldRecord.setIsRefund((byte) 0);
+        userGoldRecord.setPayPlatform("金币系统");
+        userGoldRecord.setAdminId(consumeUser.getAdminId());
+        userGoldRecord.setAuditStatus(1);
+        userGoldRecord.setCreateTime(new Date());
+        userGoldRecord.setPayTime(new Date());
+        consumeMapper.add(userGoldRecord);
+        User user = new User();
+        user.setJwcode(userGoldRecord.getJwcode());
+        user.setCurrentPermanentGold(gold.getNowPermanentGold() - consumeUser.getPermanentGold());
+        user.setCurrentFreeJune(gold.getNowFreeJune() - userGoldRecord.getFreeJune());
+        user.setCurrentFreeDecember(gold.getNowFreeDecember() - userGoldRecord.getFreeDecember());
+        user.setCurrentTaskGold(gold.getNowTaskGold() - consumeUser.getTaskGold());
+        user.setConsumeNum(gold.getConsumeNum() + 1);
+        user.setSumConsume(consumeUser.getPermanentGold() + consumeUser.getFreeGold() + consumeUser.getTaskGold());
+        userMapper.updateGold(user);
+        //对接接口
+//        GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
+//                (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) /100,
+//                userGoldRecord.getRemark(),((double) userGoldRecord.getPermanentGold() /100), userGoldRecord.getPayPlatform(), userGoldRecord.getGoodsName());
+        return Result.success();
+    }
+}

src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java

@@ -5,6 +5,12 @@ import com.example.demo.service.GeneralService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,4 +38,69 @@ public class GeneralServiceImpl implements GeneralService {
         List<String> list = generalMapper.getPlatform();
         return list;
     }
+
+    @Override
+    public List<String> getGoods() {
+        List<String> list = generalMapper.getGoods();
+        return list;
+    }
+
+    @Override
+    public List<String> getActivity() {
+        List<String> list = generalMapper.getActivity();
+        return list;
+    }
+
+
+    /*
+    获取昨天的日期
+     */
+    @Override
+    public Date getYesterday() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_YEAR, -1);  //当前天数-1
+        return getStartOfDay(cal.getTime());    //昨天的00:00:00
+    }
+    /*
+    获取某天的开始时间(00:00:00)
+     */
+    @Override
+    public Date getStartOfDay(Date date) {
+        LocalDateTime localDate = date.toInstant()
+                .atZone(ZoneId.systemDefault()) // 转换为本地时区
+                .toLocalDateTime()
+                .with(LocalTime.MIN); // 设置时间为当天 00:00:00
+        return Date.from(localDate.atZone(ZoneId.systemDefault()).toInstant());
+    }
+    /*
+    转换日期格式为yyyy-MM-dd
+    */
+    @Override
+    public String formatDate(Date date) {
+        return date.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .format(java.time.format.DateTimeFormatter.ISO_LOCAL_DATE); // 输出格式如 "2025-10-01"
+    }
+    /*
+    获取时间段内的所有日期（包含起始和结束日）
+     */
+    @Override
+    public List<Date> getAllDatesBetween(Date start, Date end) {
+        List<Date> dates = new ArrayList<>();
+        //初始化日历对象
+        Calendar tempStart = Calendar.getInstance();
+        tempStart.setTime(start);
+        Calendar tempEnd = Calendar.getInstance();
+        tempEnd.setTime(end);
+
+        while (!tempStart.after(tempEnd)) {
+            dates.add(tempStart.getTime()); // 将当前日期添加到列表中
+            tempStart.add(Calendar.DAY_OF_YEAR, 1); // 每次增加一天
+        }
+
+        return dates;
+    }
+
+
+
 }

src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java

@@ -0,0 +1,53 @@
+package com.example.demo.serviceImpl;
+
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.vo.GoldDetail;
+import com.example.demo.domain.vo.Total;
+import com.example.demo.mapper.GoldDetailMapper;
+import com.example.demo.service.GoldDetailService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @program: GOLD
+ * @ClassName GoldDetailServiceImpl
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-23 13:44
+ * @Version 1.0
+ **/
+@Service
+public class GoldDetailServiceImpl implements GoldDetailService {
+
+    @Autowired
+    private GoldDetailMapper goldDetailMapper;
+    @Override
+    public PageInfo<GoldDetail> getGoldDetail(Integer pageNum, Integer pageSize, GoldDetail goldDetail) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<GoldDetail> list= goldDetailMapper.getGoldDetail(goldDetail);
+        return new PageInfo<>(list);
+    }
+
+    @Override
+    public Total getTotal(GoldDetail goldDetail) {
+
+       return goldDetailMapper.getTotal(goldDetail);
+    }
+
+    @Override
+    public PageInfo<User> getGold(Integer pageNum, Integer pageSize, User user) {
+        PageHelper.startPage(pageNum, pageSize);
+
+        List<User> list=  goldDetailMapper.getGold(user);
+        return new PageInfo<>(list);
+    }
+
+    @Override
+    public Total GoldTotal(User user) {
+        return goldDetailMapper.GoldTotal(user);
+    }
+}

src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java

@@ -0,0 +1,115 @@
+package com.example.demo.serviceImpl;
+
+import com.example.demo.domain.entity.Admin;
+import com.example.demo.domain.entity.AdminRole;
+import com.example.demo.domain.entity.Role;
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.vo.Permission;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.mapper.AdminMapper;
+import com.example.demo.mapper.PermissionMapper;
+import com.example.demo.service.PermissionService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
+/**
+ * @program: GOLD
+ * @ClassName PermissionServiceImpl
+ * @description:
+ * @author: huangqizhen
+ * @create: 2025−06-26 13:20
+ * @Version 1.0
+ **/
+@Service
+public class PermissionServiceImpl implements PermissionService {
+
+    @Autowired
+    private PermissionMapper permissionMapper;
+    @Autowired
+    private AdminMapper adminMapper;
+    @Override
+    public List<String> getposition(String token) {
+        return permissionMapper.getposition(token);
+    }
+
+    @Override
+    public List<String> getmarket(String token) {
+        return permissionMapper.getmarket(token);
+    }
+
+    @Override
+    public PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<Permission> list=  permissionMapper.getPermission(permission);
+        return new PageInfo<>(list);
+    }
+
+    @Override
+    @Transactional
+    public Integer addpermission(Admin admin) throws  Exception {
+
+        if(!ObjectUtils.isEmpty(adminMapper.getAdmin(admin.getAccount()))){
+            throw new Exception("账号已存在");
+        }
+     if(ObjectUtils.isEmpty(admin.getAccount())){
+         throw new Exception("账号为空！");
+     }
+     if(ObjectUtils.isEmpty( admin.getMarket())){
+         throw new Exception("地区为空！");
+     }
+     if(ObjectUtils.isEmpty( admin.getPostiton())){
+         throw new Exception("职位为空！");
+     }
+     if (ObjectUtils.isEmpty( admin.getRoleId())){
+         throw new Exception("权限类别为空！");
+     }
+    if(ObjectUtils.isEmpty( admin.getAdminName())){
+        throw new Exception("用户名为空！");
+    }
+    if(ObjectUtils.isEmpty( admin.getMachineId())){
+        throw new Exception("机器编号为空！");
+    }
+        if (admin.getMachineId().contains(",")) {
+            throw new Exception("机器编号格式错误");
+        }
+    else {
+        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+        admin.setPassword(passwordEncoder.encode(("123456")));
+        permissionMapper.addPermission(admin);
+        AdminRole adminRole = new AdminRole();
+        adminRole.setAdminId(admin.getId());
+        adminRole.setRoleId(admin.getRoleId());
+      return   permissionMapper.addadminRole(adminRole);
+    }
+    }
+
+    @Override
+    public List<Role> getRole(String token) {
+        return permissionMapper.getRole(token);
+    }
+
+    @Override
+    @Transactional
+    public Integer deleteAdmin(Integer id) {
+        if (id == null){
+            return -1;
+        }
+
+        permissionMapper.deleteAdminRole(id);
+        return permissionMapper.deleteAdmin(id);
+    }
+
+    @Override
+    public Integer updateAdminRole(AdminRole adminRole) {
+        return permissionMapper.updateAdminRole(adminRole);
+    }
+
+
+}

src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

@@ -0,0 +1,131 @@
+package com.example.demo.serviceImpl;
+
+import com.example.demo.domain.entity.User;
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.*;
+import com.example.demo.mapper.ConsumeMapper;
+import com.example.demo.mapper.RechargeMapper;
+import com.example.demo.mapper.UserMapper;
+import com.example.demo.service.RechargeService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @program: gold-java
+ * @ClassName RechrageServceImpl
+ * @description:
+ * @author: Double
+ * @create: 2025−06-29 13:40
+ * @Version 1.0
+ **/
+
+@Service
+public class RechargeServiceImpl implements RechargeService {
+
+    @Autowired
+    private RechargeMapper rechargeMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+
+    @Override
+    public PageInfo<RechargeUser> selectAll(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<RechargeUser> rechargeUsers = rechargeMapper.selectAll(rechargeUser);
+        return new PageInfo<>(rechargeUsers);
+    }
+
+    @Override
+    public PageInfo<RechargeUser> selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
+        return new PageInfo<>(rechargeUsers);
+    }
+
+    @Override
+    public Gold statsGold(RechargeUser rechargeUser) {
+        Gold gold = new Gold();
+        List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
+
+        // 初始化累加器
+        int permanentGoldSum = 0;
+        int freeGoldSum = 0;
+
+        // 遍历充值记录并累加金币
+        for (RechargeUser user : rechargeUsers) {
+            // 累加永久金币
+            if (user.getPermanentGold() != null) {
+                permanentGoldSum += user.getPermanentGold();
+            }
+            // 累加免费金币
+            if (user.getFreeGold() != null) {
+                freeGoldSum += user.getFreeGold();
+            }
+        }
+
+        // 将累加结果设置到Gold对象
+        gold.setPermanentGolds(permanentGoldSum);
+        gold.setFreeGolds(freeGoldSum);
+
+        return gold;
+    }
+
+
+    @Override
+    public Result add(RechargeUser rechargeUser) {
+        UserGoldRecord userGoldRecord = new UserGoldRecord();
+
+        // 获取当前时间戳部分
+        String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+
+        // 获取自增计数器部分（三位数，不足补零）
+        AtomicInteger atomicInteger = new AtomicInteger(0);
+
+        int count = atomicInteger.getAndUpdate(c -> (c >= 999) ? 0 : c + 1);
+        String counterPart = String.format("%03d", count);
+
+
+        //订单号生成
+        userGoldRecord.setOrderCode("CZ" + timestampPart + counterPart);
+        userGoldRecord.setJwcode(rechargeUser.getJwcode());
+        userGoldRecord.setActivity(rechargeUser.getActivity());
+        userGoldRecord.setPermanentGold(rechargeUser.getPermanentGold());
+        // 获取当前月份（1-12）
+        int currentMonth = LocalDate.now().getMonthValue();
+        // 根据当前月份设置对应字段
+        if (currentMonth >= 1 && currentMonth <= 6) {
+            // 1-6月：设置6月额度，12月保持默认值
+            userGoldRecord.setFreeJune(0);
+            userGoldRecord.setFreeDecember(rechargeUser.getFreeGold());
+        } else {
+            // 7-12月：设置12月额度，6月保持默认值
+            userGoldRecord.setFreeJune(rechargeUser.getFreeGold());
+            userGoldRecord.setFreeDecember(0);
+        }
+        userGoldRecord.setSumGold(rechargeUser.getFreeGold()+rechargeUser.getPermanentGold());
+        userGoldRecord.setRateId(rechargeUser.getRateId());
+        userGoldRecord.setMoney(rechargeUser.getMoney());
+        userGoldRecord.setVoucher(rechargeUser.getVoucher());
+        userGoldRecord.setPayPlatform("金币系统");
+        userGoldRecord.setPayModel(rechargeUser.getPayModel());
+        userGoldRecord.setPayTime(rechargeUser.getPayTime());
+        userGoldRecord.setRemark(rechargeUser.getRemark());
+        userGoldRecord.setAdminId(rechargeUser.getAdminId());
+        userGoldRecord.setType((byte) 0);
+        userGoldRecord.setAuditStatus(0);
+        userGoldRecord.setCreateTime(new Date());
+
+        rechargeMapper.add(userGoldRecord);
+        return Result.success();
+    }
+}

src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java

@@ -0,0 +1,167 @@
+package com.example.demo.serviceImpl;
+
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.domain.vo.ConsumeUser;
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.RefundUser;
+import com.example.demo.domain.vo.Result;
+import com.example.demo.mapper.ConsumeMapper;
+import com.example.demo.mapper.RefundMapper;
+import com.example.demo.mapper.UserMapper;
+import com.example.demo.service.RefundService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @program: gold-java
+ * @ClassName RefundServiceImpl
+ * @description:
+ * @author: Double
+ * @create: 2025−06-27 11:50
+ * @Version 1.0
+ **/
+
+@Service
+public class RefundServiceImpl implements RefundService {
+
+    @Autowired
+    private RefundMapper refundMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Override
+    public PageInfo<RefundUser> selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<RefundUser> refundUsers = refundMapper.selectAll(refundUser);
+        return new PageInfo<>(refundUsers);
+    }
+
+    @Override
+    public Gold statsGold(RefundUser refundUser) {
+        Gold gold = new Gold();
+        List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);
+
+        // 初始化累加器
+        int permanentGoldSum = 0;
+        int freeGoldSum = 0;
+        int taskGoldSum = 0;
+
+        // 遍历推开记录并累加金币
+        for (RefundUser user : refundUsers) {
+            // 累加永久金币
+            if (user.getPermanentGold() != null) {
+                permanentGoldSum += user.getPermanentGold();
+            }
+            // 累加免费金币
+            if (user.getFreeGold() != null) {
+                freeGoldSum += user.getFreeGold();
+            }
+            // 累加任务金币
+            if (user.getTaskGold() != null) {
+                taskGoldSum += user.getTaskGold();
+            }
+        }
+
+        // 将累加结果设置到Gold对象
+        gold.setPermanentGolds(permanentGoldSum);
+        gold.setFreeGolds(freeGoldSum);
+        gold.setTaskGolds(taskGoldSum);
+
+        return gold;
+    }
+
+    @Override
+    public PageInfo<RefundUser> selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);
+        return new PageInfo<>(refundUsers);
+    }
+
+    @Override
+    public Result add(RefundUser refundUser) {
+        UserGoldRecord userGoldRecord = new UserGoldRecord();
+        String goodsNameWithOrder = refundUser.getGoodsName();
+        //订单号生成
+        if (goodsNameWithOrder != null && goodsNameWithOrder.contains("_")) {
+            String[] parts = goodsNameWithOrder.split("_", 2);
+            if (parts.length >= 2) {
+                // 提取订单号（保留原始前缀）
+                String orderCode = parts[0]; // XF202506281545524400006580
+
+                // 提取商品名（处理可能包含下划线的情况）
+                String goodsName = parts[1]; // 商品A
+
+                // 设置属性（添加退款前缀）
+                userGoldRecord.setOrderCode("TK" + orderCode); // TKXF202506281545524400006580
+                userGoldRecord.setGoodsName(goodsName); // 商品A
+            }
+        }
+        userGoldRecord.setJwcode(refundUser.getJwcode());
+        userGoldRecord.setRefundType(refundUser.getRefundType());
+        userGoldRecord.setRefundModel(refundUser.getRefundModel());
+        userGoldRecord.setPermanentGold(refundUser.getPermanentGold());
+        // 获取当前月份（1-12）
+        int currentMonth = LocalDate.now().getMonthValue();
+        // 根据当前月份设置对应字段
+        if (currentMonth >= 1 && currentMonth <= 6) {
+            // 1-6月：设置6月额度，12月保持默认值
+            userGoldRecord.setFreeJune(0);
+            userGoldRecord.setFreeDecember(refundUser.getFreeGold());
+        } else {
+            // 7-12月：设置12月额度，6月保持默认值
+            userGoldRecord.setFreeJune(refundUser.getFreeGold());
+            userGoldRecord.setFreeDecember(0);
+        }
+        userGoldRecord.setTaskGold(refundUser.getTaskGold());
+        userGoldRecord.setSumGold(refundUser.getSumGold());
+        userGoldRecord.setPayPlatform("金币系统");
+        userGoldRecord.setRemark(refundUser.getRemark());
+        userGoldRecord.setAdminId(refundUser.getAdminId());
+        userGoldRecord.setType((byte) 2);
+        userGoldRecord.setAuditStatus(0);
+        userGoldRecord.setCreateTime(new Date());
+        refundMapper.add(userGoldRecord);
+        return Result.success();
+    }
+
+    @Override
+    public List<String> getRefundType() {
+        List<String> list = refundMapper.getRefundType();
+        return list;
+    }
+
+    @Override
+    public List<RefundUser> selectGoods(Integer jwcode) {
+        List<RefundUser> refundUsers = refundMapper.selectGoods(jwcode);
+        List<RefundUser> list = new ArrayList<>();
+        for (RefundUser record : refundUsers) {
+            if (record == null) {
+                continue;
+            }
+
+            String orderCode = record.getOrderCode() != null ? record.getOrderCode() : "无订单号";
+            String goodsName = record.getGoodsName() != null ? record.getGoodsName() : "无商品名";
+
+            // 拼接格式：订单号_商品名（例如：XF20250629_商品BC）
+            String combined = orderCode + "_" + goodsName;
+            RefundUser refundUser = new RefundUser();
+            refundUser.setGoodsName(combined);
+            refundUser.setPermanentGold(record.getPermanentGold());
+            refundUser.setFreeGold(record.getFreeGold());
+            refundUser.setTaskGold(record.getTaskGold());
+            list.add(refundUser);
+        }
+        return list;
+    }
+}

src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java

@@ -1,8 +1,23 @@
 package com.example.demo.serviceImpl;
 
+import com.example.demo.domain.entity.Statistics;
+import com.example.demo.domain.entity.UserGoldRecord;
+import com.example.demo.mapper.StatisticsMapper;
+import com.example.demo.service.GeneralService;
 import com.example.demo.service.StatisticsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
 /**
  * @program: gold-java
  * @ClassName StatisticsServiceImpl
@@ -14,4 +29,302 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class StatisticsServiceImpl implements StatisticsService {
+    private static final Logger log = LoggerFactory.getLogger(StatisticsServiceImpl.class);
+    @Autowired
+    private StatisticsMapper statisticsMapper;
+    @Autowired
+    private GeneralService generalService;
+
+    /*
+       12点，18点，23点30分执行定时任务更新当天part1数据
+        */
+    @Override
+    @Scheduled(cron = "0 0 12,18 * * ?") // 分别在 12:00 和 18:00 执行
+    @Scheduled(cron = "0 30 23 * * ?")  // 在 23:30 执行
+    public void runHourlyTaskPart1() {
+        Date today = new Date();    //取当天日期
+        for(String market : generalService.getMarket()){
+            saveStatisticsPart1(market,today);
+        }
+    }
+
+    /*
+        12点，18点执行定时任务更新当天part2数据
+         */
+    @Override
+    @Scheduled(cron = "0 0 12,18 * * ?")
+    public void runHourlyTaskPart2() {
+        Date today = new Date();    //取当天日期
+        for(String market : generalService.getMarket()){
+            saveStatisticsPart2(market,today);
+        }
+    }
+    /*
+    0点执行定时任务更新近一周part2数据
+     */
+    @Override
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void runDailyTaskPart2() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_YEAR, -7); // 一周前
+        Date startDate = cal.getTime();
+        Date yesterday = generalService.getYesterday(); // 昨天
+        // 获取 Calendar 实例并设置为昨天的日期
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(yesterday);
+
+        // 设置时间为昨天的23:55
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 55);
+        //把yesterday的结束时间设为结束时间
+        Date endDate= calendar.getTime();
+        //近一周的日期列表
+        List<Date> dateList =generalService.getAllDatesBetween(startDate, endDate);
+
+        for (Date date : dateList) {
+            for (String market : generalService.getMarket()) {
+                saveStatisticsPart2(market, date);
+            }
+        }
+    }
+
+    /*
+    查询某地区某天已存在的统计数据
+     */
+    @Override
+    public Statistics getExistStatistics(String market, Date date) {
+        LocalDateTime startTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().with(LocalTime.MIN);
+        LocalDateTime endTime= startTime.plusDays(1).minusSeconds(1);
+        return statisticsMapper.selectByMarketAndDate(market,
+                Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()),
+                Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()));
+    }
+
+    /*
+    新增或更新或不修改某地区某天part1统计数据
+     */
+    @Override
+    public void saveStatisticsPart1(String market, Date date) {
+        //获取该地区该日期part1(余量属性)统计数据
+        Statistics newStats=getStatisticsPart1(market,date);
+        //获取该地区该日期已存在的数据
+        Statistics existStats = getExistStatistics(market, date);
+        //判断是否存在已存在的数据
+        if(existStats==null){
+            //没有记录，新增
+            statisticsMapper.insertPart1(newStats );
+        }else {
+            //判断新旧数据part1部分(余量属性)是否一致
+            if (!isSameStatisticsPart1(existStats,newStats)){
+                statisticsMapper.updatePart1(newStats);
+            }else{
+                System.out.println("数据未发生改变");
+            }
+        }
+    }
+
+    /*
+    新增或更新或不修改某地区某天part2统计数据
+     */
+    @Override
+    public void saveStatisticsPart2(String market, Date date){
+    //获取该地区该日期part2(余量外属性)统计数据
+    Statistics newStats=getStatisticsPart2(market,date);
+    //获取该地区该日期已存在的数据
+    Statistics existStats = getExistStatistics(market, date);
+    //判断是否存在已存在的数据
+    if(existStats==null){
+        //没有记录，新增
+        statisticsMapper.insertPart2(newStats );
+    }else {
+        //判断新旧数据part2部分(余量外属性)是否一致
+        if (!isSameStatisticsPart2(existStats,newStats)){
+            statisticsMapper.updatePart2(newStats);
+        }else{
+            System.out.println("数据未发生改变");
+        }
+    }
+    }
+
+    //根据地区与日期获取part1(余量属性)统计数据
+    @Override
+    public Statistics getStatisticsPart1(String market, Date date) {
+        //获取日期
+        LocalDate localDate=date.toInstant()
+                .atZone(ZoneId.of("Asia/Shanghai")) // 使用系统默认时区
+                .toLocalDate();
+        //初始化Statistics对象
+        Statistics statistics = new Statistics();
+        statistics.setMarket(market);
+        statistics.setCurrentDatetime(localDate);
+        //计算属性
+        //当前金币余量
+        Integer currentGold = statisticsMapper.sumCurrentPermanentGold(market)+
+                statisticsMapper.sumCurrentFreeJune( market)+
+                statisticsMapper.sumCurrentFreeDecember(market)+
+                statisticsMapper.sumCurrentTaskGold( market);
+        statistics.setCurrentGold(currentGold);
+        //较前一日变化
+       Date yesterday =generalService.getYesterday();
+        //把yesterday改为昨天的开始时间和结束时间
+        LocalDateTime startTime = yesterday.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().with(LocalTime.MIN);
+        LocalDateTime endTime= startTime.plusDays(1).minusSeconds(1);
+
+            //昨天金币余量
+        Statistics ydayStats = statisticsMapper.selectByMarketAndDate(market,  Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()),
+                Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()));
+        Integer yesterdayGold=0;
+        if (ydayStats != null) {
+            yesterdayGold = ydayStats.getCurrentGold();
+
+        }
+            Integer dailyChange = currentGold - yesterdayGold;
+            statistics.setDailyChange(dailyChange);
+
+
+
+        //当前永久金币
+        Integer currentPermanent = statisticsMapper.sumCurrentPermanentGold(market);
+        statistics.setCurrentPermanent(currentPermanent);
+        //当前免费六月金币
+        Integer currentFreeJune = statisticsMapper.sumCurrentFreeJune(market);
+        statistics.setCurrentFreeJune(currentFreeJune);
+        //当前免费十二月金币
+        Integer currentFreeDecember = statisticsMapper.sumCurrentFreeDecember(market);
+        statistics.setCurrentFreeDecember(currentFreeDecember);
+        //当前任务金币
+        Integer currentTask = statisticsMapper.sumCurrentTaskGold(market);
+        statistics.setCurrentTask(currentTask);
+        return statistics;
+    }
+
+    /*
+      根据地区与日期获取part2(余量外属性)统计数据
+    */
+    @Override
+    public Statistics getStatisticsPart2(String market, Date date) {
+        //获取日期
+        LocalDate localDate=date.toInstant()
+                .atZone(ZoneId.of("Asia/Shanghai")) // 使用系统默认时区
+                .toLocalDate();
+        //把date改为当天的开始时间和结束时间
+        LocalDateTime startTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().with(LocalTime.MIN);
+        LocalDateTime endTime= startTime.plusDays(1).minusSeconds(1);
+        //定义审核状态列表
+        List<Integer> auditStatusList = new ArrayList<>();
+        auditStatusList.add(1); // 审核通过
+        auditStatusList.add(3); // 外部传入默认通过
+        //查询当天该地区审核通过的所有数据
+        List<UserGoldRecord> records = statisticsMapper.findByMarketAndAuditStatus(market, auditStatusList,
+                Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()),Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()));
+        //初始化Statistics对象
+        Statistics statistics = new Statistics();
+        statistics.setMarket(market);
+        statistics.setCurrentDatetime(localDate);
+
+        //计算属性
+        //充值相关-当日充值（永久+免费）
+        Integer recharge = records.stream()
+                .filter(record -> record.getType() == 0) // 类型为充值
+                .mapToInt(record -> record.getPermanentGold() + record.getFreeJune() + record.getFreeDecember() + record.getTaskGold())
+                .sum();
+        statistics.setRecharge(recharge);
+        //充值相关-当日金额（永久）
+        Integer money = records.stream()
+                .filter(record -> record.getType() == 0) // 类型为充值
+                .mapToInt(UserGoldRecord::getPermanentGold)
+                .sum();
+        statistics.setMoney(money);
+        //消费相关-当日新增消费（永久）
+        Integer consumePermanent = records.stream()
+                .filter(record -> record.getType() == 1) // 类型为消费
+                .mapToInt(UserGoldRecord::getPermanentGold)
+                .sum();
+        statistics.setConsumePermanent(consumePermanent);
+        //消费相关-当日新增消费（六月免费）
+        Integer consumeFreeJune = records.stream()
+                .filter(record -> record.getType() == 1) // 类型为消费
+                .mapToInt(UserGoldRecord::getFreeJune)
+                .sum();
+        statistics.setConsumeFreeJune(consumeFreeJune);
+        //消费相关-当日新增消费（十二月免费）
+        Integer consumeFreeDecember = records.stream()
+                .filter(record -> record.getType() == 1) // 类型为消费
+                .mapToInt(UserGoldRecord::getFreeDecember)
+                .sum();
+        statistics.setConsumeFreeDecember(consumeFreeDecember);
+        //消费相关-当日新增消费（任务）
+        Integer consumeTask = records.stream()
+                .filter(record -> record.getType() == 1) // 类型为消费
+                .mapToInt(UserGoldRecord::getTaskGold)
+                .sum();
+        statistics.setConsumeTask(consumeTask);
+        //退款相关-当日退款（永久）
+        Integer refundPermanent = records.stream()
+                .filter(record -> record.getType() == 2) // 类型为退款
+                .mapToInt(UserGoldRecord::getPermanentGold)
+                .sum();
+        statistics.setRefundPermanent(refundPermanent);
+        //退款相关-当日退款（六月免费）
+        Integer refundFreeJune = records.stream()
+                .filter(record -> record.getType() == 2) // 类型为退款
+                .mapToInt(UserGoldRecord::getFreeJune)
+                .sum();
+        statistics.setRefundFreeJune(refundFreeJune);
+        //退款相关-当日退款（十二月免费）
+        Integer refundFreeDecember = records.stream()
+                .filter(record -> record.getType() == 2) // 类型为退款
+                .mapToInt(UserGoldRecord::getFreeDecember)
+                .sum();
+        statistics.setRefundFreeDecember(refundFreeDecember);
+        //退款相关-当日退款（任务）
+        Integer refundTask = records.stream()
+                .filter(record -> record.getType() == 2) // 类型为退款
+                .mapToInt(UserGoldRecord::getTaskGold)
+                .sum();
+        statistics.setRefundTask(refundTask);
+        //充值人数
+        int rechargeNum= statisticsMapper.countRechargeNum(market,Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()),Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()));
+        statistics.setRechargeNum(rechargeNum);
+        //首充人数
+        int firstRecharge= statisticsMapper.countFirstRecharge(market,Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()),Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()));
+        statistics.setFirstRecharge(firstRecharge);
+            return statistics;
+    }
+
+/*
+ * 判断两个统计对象part1(余量属性)是否相同
+ */
+private boolean isSameStatisticsPart1(Statistics oldStats, Statistics newStats) {
+    return Objects.equals(oldStats.getCurrentGold(), newStats.getCurrentGold()) &&
+            Objects.equals(oldStats.getCurrentPermanent(), newStats.getCurrentPermanent()) &&
+            Objects.equals(oldStats.getCurrentFreeJune(), newStats.getCurrentFreeJune()) &&
+            Objects.equals(oldStats.getCurrentFreeDecember(), newStats.getCurrentFreeDecember()) &&
+            Objects.equals(oldStats.getCurrentTask(), newStats.getCurrentTask()) &&
+            Objects.equals(oldStats.getDailyChange(), newStats.getDailyChange()) ;
+}
+    /*
+     * 判断两个统计对象part2(余量外属性)是否相同
+     */
+    private boolean isSameStatisticsPart2(Statistics oldStats, Statistics newStats) {
+        return Objects.equals(oldStats.getRecharge(), newStats.getRecharge()) &&
+                Objects.equals(oldStats.getMoney(), newStats.getMoney()) &&
+                Objects.equals(oldStats.getConsumePermanent(), newStats.getConsumePermanent()) &&
+                Objects.equals(oldStats.getConsumeFreeJune(), newStats.getConsumeFreeJune()) &&
+                Objects.equals(oldStats.getConsumeFreeDecember(), newStats.getConsumeFreeDecember()) &&
+                Objects.equals(oldStats.getConsumeTask(), newStats.getConsumeTask()) &&
+                Objects.equals(oldStats.getRefundPermanent(), newStats.getRefundPermanent()) &&
+                Objects.equals(oldStats.getRefundFreeJune(), newStats.getRefundFreeJune()) &&
+                Objects.equals(oldStats.getRefundFreeDecember(), newStats.getRefundFreeDecember()) &&
+                Objects.equals(oldStats.getRefundTask(), newStats.getRefundTask()) &&
+                Objects.equals(oldStats.getRechargeNum(), newStats.getRechargeNum()) &&
+                Objects.equals(oldStats.getFirstRecharge(), newStats.getFirstRecharge()) &&
+                Objects.equals(oldStats.getCurrentGold(), newStats.getCurrentGold()) &&
+                Objects.equals(oldStats.getDailyChange(), newStats.getDailyChange()) &&
+                Objects.equals(oldStats.getCurrentPermanent(), newStats.getCurrentPermanent()) &&
+                Objects.equals(oldStats.getCurrentFreeJune(), newStats.getCurrentFreeJune()) &&
+                Objects.equals(oldStats.getCurrentFreeDecember(), newStats.getCurrentFreeDecember()) &&
+                Objects.equals(oldStats.getCurrentTask(), newStats.getCurrentTask());
+    }
 }

src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java

@@ -0,0 +1,38 @@
+package com.example.demo.serviceImpl;
+
+import com.example.demo.domain.vo.Gold;
+import com.example.demo.domain.vo.GoldUser;
+import com.example.demo.mapper.ConsumeMapper;
+import com.example.demo.mapper.UserMapper;
+import com.example.demo.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: gold-java
+ * @ClassName UserServiceImpl
+ * @description:
+ * @author: Double
+ * @create: 2025−06-25 10:32
+ * @Version 1.0
+ **/
+
+
+@Service
+public class UserServiceImpl implements UserService {
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Override
+    public GoldUser selectUser(String jwcode) {
+        GoldUser user = userMapper.selectUser(jwcode);
+        return user;
+    }
+
+    @Override
+    public GoldUser selectgold(String jwcode) {
+        GoldUser gold = userMapper.selectGold(jwcode);
+        return gold;
+    }
+}

src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java

@@ -1,11 +1,24 @@
 package com.example.demo.serviceImpl;
 
+import com.example.demo.domain.entity.Statistics;
 import com.example.demo.domain.vo.WorkbenchCard;
+import com.example.demo.domain.vo.WorkbenchMarketCard;
+import com.example.demo.mapper.StatisticsMapper;
 import com.example.demo.mapper.WorkBenchMapper;
+import com.example.demo.service.GeneralService;
+import com.example.demo.service.StatisticsService;
 import com.example.demo.service.WorkbenchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.DayOfWeek;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,23 +32,206 @@ import java.util.List;
 
 @Service
 public class WorkbenchServiceImpl implements WorkbenchService {
-
     @Autowired
-    private WorkBenchMapper workbenchMapper;
+    private WorkBenchMapper workBenchMapper;
+    @Autowired
+    private GeneralService generalService;
+    @Autowired
+    private StatisticsMapper statisticsMapper;
     @Override
-    public WorkbenchCard getCard1(String token, List<String> areas) {
-        return workbenchMapper.getCard1(areas);
+    public WorkbenchCard getCard(String token) {
+        Date date=new Date();
+        // 获取开始时间和结束时间（当天）
+        LocalDateTime startOfDay = date.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime()
+                .with(LocalTime.MIN);
+
+        LocalDateTime endOfDay = startOfDay.plusDays(1).minusSeconds(1);
+        // 获取当前日期
+        LocalDate today = LocalDate.now();
+        // 获取当前年份的第一天
+        LocalDate firstDayOfYear = today.withDayOfYear(1);
+        Date yearlyStartDate=Date.from(firstDayOfYear.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        List<String> markets = generalService.getMarket();
+        List<WorkbenchMarketCard> marketCards = new ArrayList<>();
+        // 遍历每个 marketCard 并填充数据
+        for (String market : markets) {
+            if (market == null || market.trim().isEmpty()) continue;
+
+            // 查询该地区当天的数据
+            Statistics statistics = statisticsMapper.selectByMarketAndDate(
+                    market,
+                    Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()),
+                    Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant())
+            );
+            WorkbenchMarketCard card = new WorkbenchMarketCard();
+            card.setMarket(market);
+            if (statistics != null){
+
+                // 卡片一：当前金币相关
+                card.setCurrentPermanent(statistics.getCurrentPermanent());//余量-永久金币
+                card.setCurrentFreeJune(statistics.getCurrentFreeJune());     //余量-免费六月金币
+                card.setCurrentFreeDecember(statistics.getCurrentFreeDecember());    //余量-免费十二月金币
+                card.setCurrentTask(statistics.getCurrentTask());     //余量-任务金币
+                card.setCurrentFree(card.getCurrentFreeJune() + card.getCurrentFreeDecember());    //余量-免费金币
+                card.setCurrentGold(card.getCurrentPermanent() + card.getCurrentFree() + card.getCurrentTask());    //余量-总金币
+                card.setDailyChange(statistics.getDailyChange());    //较前一日变化
+                // 卡片二：充值相关
+                card.setRecharge(statistics.getRecharge()); //充值-当日充值
+                card.setMoney(statistics.getMoney());   //充值-当日金额（永久）
+                card.setYearlyRecharge(calculateSum(market, "recharge",yearlyStartDate ,date));//充值-全年累计充值
+                card.setYearlyMoney(calculateSum(market, "money",yearlyStartDate ,date)); //充值-全年累计金额（永久）
+                // 卡片三：消费与退款
+                card.setConsumePermanent(statistics.getConsumePermanent());//消费-永久金币
+                card.setConsumeFreeJune(statistics.getConsumeFreeJune());//消费-免费六月金币
+                card.setConsumeFreeDecember(statistics.getConsumeFreeDecember());//消费-免费十二月金币
+                card.setConsumeTask(statistics.getConsumeTask());//消费-任务金币
+                card.setRefundPermanent(statistics.getRefundPermanent());//退款-永久金币
+                card.setRefundFreeJune(statistics.getRefundFreeJune());//退款-免费六月金币
+                card.setRefundFreeDecember(statistics.getRefundFreeDecember());//退款-免费十二月金币
+                card.setRefundTask(statistics.getRefundTask());//退款-任务金币
+                //当日总消费
+                int totalConsume = card.getConsumePermanent() + card.getConsumeFreeJune() + card.getConsumeFreeDecember() + card.getConsumeTask();
+                //当日总退款
+                int totalRefund = card.getRefundPermanent() + card.getRefundFreeJune() + card.getRefundFreeDecember() + card.getRefundTask();
+                card.setDailyReduce(totalConsume - totalRefund);//当日总消耗
+                card.setYearlyConsume(calculateSum(market, "consume", yearlyStartDate,date));//年累计消费
+                card.setYearlyRefund(calculateSum(market, "refund",yearlyStartDate ,date));//年累计退款
+                card.setYearlyReduce(card.getYearlyConsume() - card.getYearlyRefund());//年累计消耗
+                // 卡片四：人头数相关
+                card.setRechargeNum(statistics.getRechargeNum());
+                card.setFirstRecharge(statistics.getFirstRecharge());
+                card.setYearlyRechargeNum(calculateSum(market,"rechargeNum",yearlyStartDate,date));
+
+                // 周环比、日同比
+                card.setWow(calculateWeekOverWeek(market, date));
+                card.setDaily(calculateDayOverDay(market, date));
+
+                marketCards.add(card);
+            }
+
+        }
+        return new WorkbenchCard(token, marketCards,markets,date,date);
     }
 
     @Override
-    public WorkbenchCard getCard2(String token, List<String> areas) {
+    public WorkbenchCard getGraph(String token,  Date startDate, Date endDate, List<String> markets) {
+        List<WorkbenchMarketCard> marketCards = new ArrayList<>();
 
-        return workbenchMapper.getCard2(areas);
+        for (String market : markets) {
+            WorkbenchMarketCard cards = new WorkbenchMarketCard();
+            cards.setMarket(market);
+            cards.setSumRechargePermanent(calculateSum(market, "money",startDate,endDate));
+            cards.setSumRechargeFree(calculateSum(market, "rFree",startDate,endDate));
+            cards.setSumConsumePermanent(calculateSum(market, "cPermanent",startDate,endDate));
+            cards.setSumConsumeFree(calculateSum(market, "cFree",startDate,endDate));
+            cards.setSumConsumeTask(calculateSum(market, "cTask",startDate,endDate));
+            marketCards.add( cards);
+        }
+        return new WorkbenchCard(token, marketCards,markets,startDate,endDate);
     }
 
+    /*
+    根据类型获取统计数据
+     */
     @Override
-    public WorkbenchCard getCard3(String token, List<String> areas) {
+    public Integer calculateSum(String market, String type, Date startDate,Date endDate) {
 
-        return workbenchMapper.getCard3(areas);
+        //判断类型
+        switch
+            (type) {
+            case "recharge":    //获取累计充值
+                return workBenchMapper.sumRecharge(market, startDate,endDate);
+            case "money":    //获取累计金额（永久）
+                return workBenchMapper.sumMoney(market,startDate,endDate);
+            case "rFree":   //获取累计充值（免费）
+                return workBenchMapper.sumRecharge(market,startDate,endDate)-
+                        workBenchMapper.sumMoney(market,startDate,endDate);
+            case "consume":    //获取累计消费
+                return workBenchMapper.sumConsume(market,startDate,endDate);
+            case "cPermanent":    //获取累计消费-永久
+                return workBenchMapper.sumCPermanent(market,startDate,endDate);
+            case "cFree":    //获取累计消费- 免费
+                return workBenchMapper.sumCFree(market,startDate,endDate);
+            case "cTask":    //获取累计消费- 任务
+                return workBenchMapper.sumCTask(market,startDate,endDate);
+            case "refund":    //获取累计退款
+                return workBenchMapper.sumRefund(market,startDate,endDate);
+            case "rechargeNum":    //获取累计充值人数
+                return workBenchMapper.countRechargeNum(market,startDate,endDate);
+            default:
+                    return 0;
+            }
+
+    }
+    /*
+    获取该日期该市场的日同比
+    */
+    @Override
+    public Integer calculateDayOverDay(String market, Date date) {
+        //传入日期的数据
+        LocalDateTime startTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().with(LocalTime.MIN);
+        LocalDateTime endTime= startTime.plusDays(1).minusSeconds(1);
+        Statistics currentStatistics = statisticsMapper.selectByMarketAndDate(market,
+                Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()),
+                Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()));
+        //空数据或数量为零，为避免0除数错误，返回增长率为0
+        if (currentStatistics == null || currentStatistics.getRechargeNum() == null) {
+            return 0;
+        }
+        Date yesterday = addDays(date, -1);   //传入日期减一，昨天
+        Statistics yesterdayStatistics = statisticsMapper.selectByMarketAndDate(market,
+                Date.from(yesterday.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().with(LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant()),
+                Date.from(yesterday.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().with(LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant()));
+        //空数据或数量为零，为避免0除数错误，返回增长率为0
+        if (yesterdayStatistics == null || yesterdayStatistics.getRechargeNum() == null || yesterdayStatistics.getRechargeNum() == 0) {
+            return 0;
+        }
+        //计算增长率
+        double rate = ((double) (currentStatistics.getRechargeNum() - yesterdayStatistics.getRechargeNum()) / yesterdayStatistics.getRechargeNum()) * 100;
+        return (int) Math.round(rate);
     }
+    /*
+    获取该日期该市场的周环比
+    */
+    @Override
+    public Integer calculateWeekOverWeek(String market, Date date) {
+        //获取传入日期所在周的周一
+        Date thisWeekStart = getStartOfWeek(date);
+        //获取传入日期上一周的周一
+        Date lastWeekStart = addDays(thisWeekStart, -7);
+        // 获取本周周一至今天的充值人数总和
+        int thisWeekTotal = statisticsMapper.countRechargeNum(market, thisWeekStart, date);
+        // 获取上周同一时间段的充值人数总和
+        int lastWeekTotal = statisticsMapper.countRechargeNum(market, lastWeekStart, addDays(date, -7));
+        if (lastWeekTotal == 0) {
+            return 0; // 避免除以零的情况
+        }
+        double rate = ((double) (thisWeekTotal - lastWeekTotal) / lastWeekTotal) * 100;
+        return (int) Math.round(rate);
+    }
+
+    @Override
+    public Date addDays(Date date, int days) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);  //设置日期为传入的日期
+        cal.add(Calendar.DATE, days);   //传入日期加上多少天
+        return cal.getTime();   //返回处理后的日期
+    }
+
+    @Override
+    public Date getStartOfWeek(Date date) {
+        // 将 Date 转换为 LocalDate
+        LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        // 获取周一作为一周的第一天
+        DayOfWeek firstDayOfWeek = DayOfWeek.MONDAY;
+
+        // 返回所在周的第一天，转换回Date格式
+        return Date.from(localDate.with(firstDayOfWeek)
+                .atStartOfDay(ZoneId.systemDefault())
+                .toInstant());
+    }
+
+
 }

src/main/resources/application.yml

@@ -4,9 +4,9 @@ spring:
       fail-on-unknown-properties: false
   datasource:
     mysql1:
-      jdbc-url: jdbc:mysql://localhost:3306/hwgold?serverTimezone=Asia/Shanghai
-      username: hwgold
-      password: 123456
+      jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgoldc?serverTimezone=Asia/Shanghai
+      username: hwgoldc
+      password: zB48T55wCsHC8KPz
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql1HikariCP
@@ -62,9 +62,9 @@ spring:
   data:
     redis:
       database: 0
-      host: 54.251.137.151
-      port: 10703
-      password: 8912h12jhhajsd
+      host: 192.168.8.94
+      port: 6379
+      password:
       timeout: 1000
       lettuce:
         pool:
@@ -91,7 +91,7 @@ upload:
 
 
 server:
-  port: 8080
+  port: 8081
 
   logging:
     level:

src/main/resources/mapper/AdminMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.AdminMapper">
+
+    <select id="getAdmin" resultType="com.example.demo.domain.entity.Admin">
+        select * from admin
+        where account=#{account}
+    </select>
+</mapper>

src/main/resources/mapper/AuditMapper.xml

@@ -1,5 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.demo.mapper.AuditMapper">
+   <!-- 修改订单审核人与审核状态-->
+    <update id="updateOrder">
+        update user_gold_record
+        set audit_id = #{auditId},
+            audit_status = #{auditStatus},
+            reject_reason = #{rejectReason}
+        where order_code = #{orderCode}
+    </update>
+    <!--更新用户余额-->
+    <update id="updateUserGold">
+        update user
+        set sum_permanent_gold = sum_permanent_gold + COALESCE(#{sumPermanentGold},0),
+            sum_free_june = sum_free_june + COALESCE(#{sumFreeJune},0),
+            sum_free_december = sum_free_december + COALESCE(#{sumFreeDecember},0),
+            sum_task_gold = sum_task_gold + COALESCE(#{sumTaskGold},0),
+            current_permanent_gold = current_permanent_gold + COALESCE(#{currentPermanentGold},0),
+            current_free_june = current_free_june + COALESCE(#{currentFreeJune},0),
+            current_free_december = current_free_december + COALESCE(#{currentFreeDecember},0),
+            current_task_gold = current_task_gold + COALESCE(#{currentTaskGold},0)
+        where jwcode = #{jwcode}
+    </update>
+    <!--修改消费订单为已退款-->
+    <update id="updateOrderRefund">
+        update user_gold_record
+        set is_refund = 1
+        where order_code = #{orderCode}
+    </update>
+    <!--根据订单号查订单-->
 
+    <select id="selectOrderByOrderCode" resultType="com.example.demo.domain.entity.UserGoldRecord">
+        select * from user_gold_record where order_code = #{orderCode}
+    </select>
+    <!--多条件查询充值审核订单-->
+    <select id="selectRechargeBy" resultType="com.example.demo.domain.vo.RechargeAudit">
+        SELECT ugr.*,
+        u.name as name,
+        u.market as market,
+        a1.admin_name as adminName,
+        a2.admin_name as auditName
+        FROM user_gold_record as ugr
+        LEFT JOIN user u ON ugr.jwcode = u.jwcode
+        LEFT JOIN admin a1 ON ugr.admin_id = a1.id
+        LEFT JOIN admin a2 ON ugr.audit_id = a2.id
+
+        <where>
+            <if test="rechargeAudit.jwcode != null and rechargeAudit.jwcode != ''">
+                AND ugr.jwcode = #{rechargeAudit.jwcode}
+            </if>
+            <if test="rechargeAudit.activity != null and rechargeAudit.activity != ''">
+                AND ugr.activity = #{rechargeAudit.activity}
+            </if>
+            <if test="rechargeAudit.payModel != null and rechargeAudit.payModel != ''">
+                AND ugr.payModel = #{rechargeAudit.payModel}
+            </if>
+            <if test="rechargeAudit.market != null and rechargeAudit.market != ''">
+                AND u.market = #{rechargeAudit.market}
+            </if>
+            <if test="rechargeAudit.startTime != null and rechargeAudit.endTime != null ">
+                AND ugr.pay_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime}
+            </if>
+
+            <if test="rechargeAudit.auditStatus != null and rechargeAudit.auditStatus != ''">
+                AND ugr.audit_status = #{rechargeAudit.auditStatus}
+            </if>
+                AND ugr.type = 0
+
+        </where>
+    </select>
+    <!--多条件查询退款审核订单-->
+    <select id="selectRefundBy" resultType="com.example.demo.domain.vo.RefundAudit">
+        SELECT ugr.*,
+        u.name as name,
+        u.market as market,
+        a1.admin_name as adminName,
+        a2.admin_name as auditName
+        FROM user_gold_record as ugr
+        LEFT JOIN user u ON ugr.jwcode = u.jwcode
+        LEFT JOIN admin a1 ON ugr.admin_id = a1.id
+        LEFT JOIN admin a2 ON ugr.audit_id = a2.id
+
+        <where>
+            <if test="refundAudit.jwcode != null and refundAudit.jwcode != ''">
+                AND ugr.jwcode = #{refundAudit.jwcode}
+            </if>
+            <if test="refundAudit.refundModel != null and refundAudit.refundModel != ''">
+                AND ugr.refund_model = #{refundAudit.refundModel}
+            </if>
+            <if test="refundAudit.goodsName != null and refundAudit.goodsName != ''">
+                AND ugr.goods_name = #{refundAudit.goodsName}
+            </if>
+            <if test="refundAudit.market != null and refundAudit.market != ''">
+                AND u.market = #{refundAudit.market}
+            </if>
+            <if test="refundAudit.startTime != null and refundAudit.endTime != null ">
+                AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime}
+            </if>
+
+            <if test="refundAudit.auditStatus != null and refundAudit.auditStatus != ''">
+                AND ugr.audit_status = #{refundAudit.auditStatus}
+            </if>
+            AND ugr.type = 2
+
+        </where>
+    </select>
 </mapper>

src/main/resources/mapper/ConsumeMapper.xml

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.ConsumeMapper">
+
+    <!-- 查询所有消费记录 -->
+    <select id="selectAll" resultType="com.example.demo.domain.vo.ConsumeUser">
+        SELECT u.name AS name,
+        u.jwcode AS jwcode,
+        u.market AS market,
+        ugr.goods_name AS goodsName,
+        ugr.pay_platform AS payPlatform,
+        ugr.sum_gold AS sumGold,
+        ugr.permanent_gold AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.task_gold AS taskGold,
+        ugr.remark AS remark,
+        a.admin_name AS adminName,
+        ugr.create_time AS createTime
+        FROM user u
+        JOIN
+        user_gold_record ugr ON u.jwcode = ugr.jwcode
+        JOIN
+        admin a ON ugr.admin_id = a.id
+        WHERE ugr.type = 1
+        <trim prefix="ORDER BY" suffixOverrides=",">
+            <choose>
+                <!-- 当指定排序字段时使用指定字段排序 -->
+                <when test="sortField != null and sortField != ''">
+                    <choose>
+                        <!-- 对三种金币数量的排序处理 -->
+                        <when test="sortField == 'taskGold'">ugr.task_gold</when>
+                        <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <!-- 对时间字段的排序处理 -->
+                        <when test="sortField == 'createTime'">ugr.create_time</when>
+                        <!-- 其他字段不支持排序，使用默认排序 -->
+                        <otherwise>ugr.create_time</otherwise>
+                    </choose>
+
+                    <!-- 排序方向处理 -->
+                    <if test="sortOrder != null and sortOrder != ''">
+                        <choose>
+                            <when test="sortOrder == 'ASC'">ASC</when>
+                            <when test="sortOrder == 'DESC'">DESC</when>
+                            <otherwise>DESC</otherwise>
+                        </choose>
+                    </if>
+                    <if test="sortOrder == null or sortOrder == ''">
+                        DESC
+                    </if>
+                </when>
+
+                <!-- 未指定排序字段时，使用默认的时间降序排序 -->
+                <otherwise>
+                    ugr.create_time DESC
+                </otherwise>
+            </choose>
+        </trim>
+    </select>
+
+    <!-- 查询筛选后消费记录 -->
+    <select id="selectBy" resultType="com.example.demo.domain.vo.ConsumeUser">
+        SELECT u.name AS name,
+        u.jwcode AS jwcode,
+        u.market AS market,
+        ugr.goods_name AS goodsName,
+        ugr.pay_platform AS payPlatform,
+        ugr.sum_gold AS sumGold,
+        ugr.permanent_gold AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.task_gold AS taskGold,
+        ugr.remark AS remark,
+        a.admin_name AS adminName,
+        ugr.create_time AS createTime
+        FROM user u
+        JOIN
+        user_gold_record ugr ON u.jwcode = ugr.jwcode
+        JOIN
+        admin a ON ugr.admin_id = a.id
+        <where>
+            ugr.type = 1
+            <if test="jwcode != null and jwcode != ''">
+                AND ugr.jwcode = #{jwcode}
+            </if>
+            <if test="goodsName != null and goodsName != ''">
+                AND ugr.goods_name = #{goodsName}
+            </if>
+            <if test="market != null and market != ''">
+                AND u.market = #{market}
+            </if>
+            <if test="payPlatform != null and payPlatform != ''">
+                AND ugr.pay_platform = #{payPlatform}
+            </if>
+            <if test="startTime != null and endTime != null">
+                AND ugr.create_time BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
+        <trim prefix="ORDER BY" suffixOverrides=",">
+            <choose>
+                <!-- 当指定排序字段时使用指定字段排序 -->
+                <when test="sortField != null and sortField != ''">
+                    <choose>
+                        <!-- 对三种金币数量的排序处理 -->
+                        <when test="sortField == 'taskGold'">ugr.task_gold</when>
+                        <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <!-- 对时间字段的排序处理 -->
+                        <when test="sortField == 'createTime'">ugr.create_time</when>
+                        <!-- 其他字段不支持排序，使用默认排序 -->
+                        <otherwise>ugr.create_time</otherwise>
+                    </choose>
+
+                    <!-- 排序方向处理 -->
+                    <if test="sortOrder != null and sortOrder != ''">
+                        <choose>
+                            <when test="sortOrder == 'ASC'">ASC</when>
+                            <when test="sortOrder == 'DESC'">DESC</when>
+                            <otherwise>DESC</otherwise>
+                        </choose>
+                    </if>
+                    <if test="sortOrder == null or sortOrder == ''">
+                        DESC
+                    </if>
+                </when>
+
+                <!-- 未指定排序字段时，使用默认的时间降序排序 -->
+                <otherwise>
+                    ugr.create_time DESC
+                </otherwise>
+            </choose>
+        </trim>
+    </select>
+
+    <insert id="add" parameterType="com.example.demo.domain.entity.UserGoldRecord" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO user_gold_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            order_code,
+            jwcode,
+            sum_gold,
+            permanent_gold,
+            free_june,
+            free_december,
+            task_gold,
+            goods_name,
+            remark,
+            type,
+            pay_platform,
+            is_refund,
+            admin_id,
+            audit_status,
+            create_time,
+            pay_time
+        </trim>
+        VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{orderCode},
+            #{jwcode},
+            #{sumGold},
+            #{permanentGold},
+            #{freeJune},
+            #{freeDecember},
+            #{taskGold},
+            #{goodsName},
+            #{remark},
+            #{type},
+            #{payPlatform},
+            #{isRefund},
+            #{adminId},
+            #{auditStatus},
+            #{createTime},
+            #{payTime}
+        </trim>
+    </insert>
+</mapper>

src/main/resources/mapper/GeneralMapper.xml

@@ -8,4 +8,10 @@
     <select id="getPlatform" resultType="java.lang.String">
         select DISTINCT pay_platform from user_gold_record
     </select>
+    <select id="getGoods" resultType="java.lang.String">
+        select DISTINCT goods_name from user_gold_record
+    </select>
+    <select id="getActivity" resultType="java.lang.String">
+        select DISTINCT activity from user_gold_record
+    </select>
 </mapper>

src/main/resources/mapper/GoldDetailMapper.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.GoldDetailMapper">
+
+    <select id="getGoldDetail" resultType="com.example.demo.domain.vo.GoldDetail">
+        select `user`.name, `user`.jwcode, `user`.market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time
+        from user_gold_record ugr
+        left join `user` on `user`.jwcode = `ugr`.jwcode
+        left join `admin` on `admin`.id = `ugr`.admin_id
+        <where>
+            <if test="jwcode != null and jwcode.length > 0">
+                and `ugr`.jwcode = #{jwcode}
+            </if>
+            <if test="payPlatform != null and payPlatform.length > 0">
+                and `ugr`.pay_platform = #{payPlatform}
+            </if>
+            <if test="type != null and type.length > 0">
+                and `ugr`.type = #{type}
+            </if>
+            <if test="market != null and market.length > 0">
+                and `user`.market = #{market}
+            </if>
+            <if test="startTime != null and endTime != null">
+                and ugr.`audit_time` BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
+            <choose>
+                <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
+                    ORDER BY ${sortField} ${sortOrder}
+                </when>
+                <otherwise>
+                    ORDER BY audit_time DESC
+                </otherwise>
+            </choose>
+
+    </select>
+    <select id="getTotal" resultType="com.example.demo.domain.vo.Total">
+        select sum(sum_gold) as Goldtotal, sum(permanent_gold) as permanentGold, sum(free_june+free_december) as freeGold, sum(task_gold) as taskGold
+        from user_gold_record
+        <where>
+            <if test="jwcode != null and jwcode.length > 0">
+                and `ugr`.jwcode = #{jwcode}
+            </if>
+            <if test="payPlatform != null and payPlatform.length > 0">
+                and `ugr`.pay_platform = #{payPlatform}
+            </if>
+            <if test="type != null and type.length > 0">
+                and `ugr`.type = #{type}
+            </if>
+            <if test="market != null and market.length > 0">
+                and `user`.market = #{market}
+            </if>
+            <if test="startTime != null and endTime != null">
+                and ugr.`audit_time` BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
+
+    </select>
+    <select id="getGold" resultType="com.example.demo.domain.entity.User">
+        select * from user
+        <where>
+            <if test="jwcode != null and jwcode.length > 0">
+                and jwcode = #{jwcode}
+            </if>
+            <if test="market != null and market.length > 0">
+                and market = #{market}
+            </if>
+        </where>
+        <choose>
+            <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
+                ORDER BY ${sortField} ${sortOrder}
+            </when>
+            <otherwise>
+                ORDER BY create_time DESC
+            </otherwise>
+        </choose>
+    </select>
+    <select id="GoldTotal" resultType="com.example.demo.domain.vo.Total">
+        select
+        sum(current_permanent_gold) as permanentGold,
+        sum(current_free_june + current_free_december) as freeGold,
+        sum(current_task_gold) as taskGold,
+        sum(current_permanent_gold) + sum(current_free_june + current_free_december) + sum(current_task_gold) as Goldtotal
+        from `user`
+        <where>
+            <if test="jwcode != null and jwcode.length > 0">
+                and jwcode = #{jwcode}
+            </if>
+            <if test="market != null and market.length > 0">
+                and market = #{market}
+            </if>
+        </where>
+    </select>
+</mapper>

src/main/resources/mapper/PermissionMapper.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.PermissionMapper">
+    <insert id="addPermission" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+        insert into admin(admin_name,machine_id,account,password,market,postiton,remark,admin_status)
+        values(#{adminName},#{machineId},#{account},#{password},#{market},#{postiton},#{remark},1)
+    </insert>
+    <insert id="addadminRole">
+        insert into admin_role(admin_id,role_id)
+        values(#{adminId},#{roleId})
+    </insert>
+    <update id="updatePermission">
+        update admin
+        <set>
+            <if test="name!=null">
+                admin_name=#{name},
+            </if>
+            <if test="market!=null">
+                market=#{market},
+            </if>
+            <if test="postiton!=null">
+                postiton=#{postiton},
+            </if>
+            <if test="role!=null">
+                roleId=#{role},
+            </if>
+        </set>
+        where id= #{id}
+    </update>
+    <update id="updateAdminRole">
+        update admin_role
+        <set>
+            <if test="roleId!=null">
+                role_id= #{roleId},
+            </if>
+        </set>
+        where admin_id= #{adminId}
+    </update>
+    <delete id="deleteAdmin">
+        delete from admin where id=#{id}
+    </delete>
+    <delete id="deleteAdminRole">
+        delete from admin_role where admin_id= #{id}
+    </delete>
+    <select id="getposition" resultType="java.lang.String">
+        select distinct postiton from admin
+    </select>
+    <select id="getmarket" resultType="java.lang.String">
+        select distinct market from admin
+    </select>
+    <select id="getPermission" resultType="com.example.demo.domain.vo.Permission">
+        select admin.id,admin.admin_name,admin.account,admin.market,admin.postiton,admin.remark,admin.admin_status,role.role_name
+        from admin
+        left join admin_role on admin.id=admin_role.admin_id
+        left join role on admin_role.role_id=role.id
+
+        <where>
+            <if test="account!=null and account.length>0">
+                admin.account=#{account}
+            </if>
+            <if test="market!=null and market.length>0">
+                admin.market=#{market}
+            </if>
+            <if test="postiton!=null and postiton.length>0">
+                admin.postiton=#{postiton}
+            </if>
+        </where>
+    </select>
+    <select id="getRole" resultType="com.example.demo.domain.entity.Role">
+        select * from role
+    </select>
+
+</mapper>

src/main/resources/mapper/RechargeMapper.xml

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.RechargeMapper">
+
+    <!-- 查询所有充值记录 -->
+    <select id="selectAll" resultType="com.example.demo.domain.vo.RechargeUser">
+        SELECT
+        u.name AS name,
+        u.jwcode AS jwcode,
+        u.market AS market,
+        ugr.activity AS activity,
+        ugr.rate_id AS rateId,
+        r.rate_name AS rateName,
+        ugr.money AS money,
+        ugr.permanent_gold AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.pay_model AS payModel,
+        ugr.pay_platform AS payPlatform,
+        ugr.remark AS remark,
+        ugr.admin_id AS adminId,
+        a.admin_name AS adminName,
+        ugr.pay_time AS payTime
+        FROM user u
+        JOIN user_gold_record ugr ON u.jwcode = ugr.jwcode
+        JOIN admin a ON ugr.admin_id = a.id
+        JOIN rate r ON ugr.rate_id = r.id
+        WHERE ugr.type = 0
+
+        <trim prefix="ORDER BY" suffixOverrides=",">
+            <choose>
+                <!-- 当指定排序字段时使用指定字段排序 -->
+                <when test="sortField != null and sortField != ''">
+                    <choose>
+                        <!-- 对金币数量的排序处理 -->
+                        <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <!-- 对时间字段的排序处理 -->
+                        <when test="sortField == 'payTime'">ugr.pay_time</when>
+                        <!-- 其他字段不支持排序，使用默认排序 -->
+                        <otherwise>ugr.pay_time</otherwise>
+                    </choose>
+
+                    <!-- 排序方向处理 -->
+                    <if test="sortOrder != null and sortOrder != ''">
+                        <choose>
+                            <when test="sortOrder == 'ASC'">ASC</when>
+                            <when test="sortOrder == 'DESC'">DESC</when>
+                            <otherwise>DESC</otherwise>
+                        </choose>
+                    </if>
+                    <if test="sortOrder == null or sortOrder == ''">
+                        DESC
+                    </if>
+                </when>
+
+                <!-- 未指定排序字段时，使用默认的时间降序排序 -->
+                <otherwise>
+                    ugr.pay_time DESC
+                </otherwise>
+            </choose>
+        </trim>
+    </select>
+
+    <!-- 查询筛选后充值记录 -->
+    <select id="selectBy" resultType="com.example.demo.domain.vo.RechargeUser">
+        SELECT
+        u.name AS name,
+        u.jwcode AS jwcode,
+        u.market AS market,
+        ugr.activity AS activity,
+        ugr.rate_id AS rateId,
+        r.rate_name AS rateName,
+        ugr.money AS money,
+        ugr.permanent_gold AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.pay_model AS payModel,
+        ugr.pay_platform AS payPlatform,
+        ugr.remark AS remark,
+        ugr.admin_id AS adminId,
+        a.admin_name AS adminName,
+        ugr.pay_time AS payTime
+        FROM user u
+        JOIN user_gold_record ugr ON u.jwcode = ugr.jwcode
+        JOIN admin a ON ugr.admin_id = a.id
+        JOIN rate r ON ugr.rate_id = r.id
+        <where>
+            ugr.type = 0
+            <if test="jwcode != null and jwcode != ''">
+                AND ugr.jwcode = #{jwcode}
+            </if>
+            <if test="activity != null and activity != ''">
+                AND ugr.activity = #{activity}
+            </if>
+            <if test="market != null and market != ''">
+                AND u.market = #{market}
+            </if>
+            <if test="payPlatform != null and payPlatform != ''">
+                AND ugr.pay_platform = #{payPlatform}
+            </if>
+            <if test="startTime != null and endTime != null">
+                AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
+        <trim prefix="ORDER BY" suffixOverrides=",">
+            <choose>
+                <!-- 当指定排序字段时使用指定字段排序 -->
+                <when test="sortField != null and sortField != ''">
+                    <choose>
+                        <!-- 对金币数量的排序处理 -->
+                        <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
+                        <when test="sortField == 'money'">ugr.money</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <!-- 对时间字段的排序处理 -->
+                        <when test="sortField == 'payTime'">ugr.pay_time</when>
+                        <!-- 其他字段不支持排序，使用默认排序 -->
+                        <otherwise>ugr.pay_time</otherwise>
+                    </choose>
+
+                    <!-- 排序方向处理 -->
+                    <if test="sortOrder != null and sortOrder != ''">
+                        <choose>
+                            <when test="sortOrder == 'ASC'">ASC</when>
+                            <when test="sortOrder == 'DESC'">DESC</when>
+                            <otherwise>DESC</otherwise>
+                        </choose>
+                    </if>
+                    <if test="sortOrder == null or sortOrder == ''">
+                        DESC
+                    </if>
+                </when>
+
+                <!-- 未指定排序字段时，使用默认的时间降序排序 -->
+                <otherwise>
+                    ugr.pay_time DESC
+                </otherwise>
+            </choose>
+        </trim>
+    </select>
+
+    <insert id="add" parameterType="com.example.demo.domain.entity.UserGoldRecord" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO user_gold_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            order_code,
+            jwcode,
+            activity,
+            sum_gold,
+            permanent_gold,
+            free_june,
+            free_december,
+            rate_id,
+            money,
+            voucher,
+            pay_platform,
+            pay_model,
+            pay_time,
+            remark,
+            admin_id,
+            type,
+            audit_status,
+            create_time
+        </trim>
+        VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{orderCode},
+            #{jwcode},
+            #{activity},
+            #{sumGold},
+            #{permanentGold},
+            #{freeJune},
+            #{freeDecember},
+            #{rateId},
+            #{money},
+            #{voucher},
+            #{payPlatform},
+            #{payModel},
+            #{payTime},
+            #{remark},
+            #{adminId},
+            #{type},
+            #{auditStatus},
+            #{createTime}
+        </trim>
+    </insert>
+</mapper>

src/main/resources/mapper/RefundMapper.xml

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.RefundMapper">
+
+    <!-- 查询所有退款记录 -->
+    <select id="selectAll" resultType="com.example.demo.domain.vo.RefundUser">
+        SELECT u.name                                                        AS name,
+               u.jwcode                                                      AS jwcode,
+               u.market                                                      AS market,
+               ugr.order_code AS orderCode,
+               ugr.goods_name                                                AS goodsName,
+               ugr.refund_model                                              AS refundModel,
+               ugr.refund_type                                               AS refundType,
+               ugr.sum_gold                                                  AS sumGold,
+               ugr.permanent_gold                                            AS permanentGold,
+               (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+               ugr.task_gold                                                 AS taskGold,
+               ugr.remark                                                    AS remark,
+               a.admin_name                                                  AS adminName,
+               ugr.create_time                                                  AS createTime
+        FROM user u
+                 JOIN
+             user_gold_record ugr ON u.jwcode = ugr.jwcode
+                 JOIN
+             admin a ON ugr.admin_id = a.id
+        WHERE ugr.type = 2
+        <trim prefix="ORDER BY" suffixOverrides=",">
+            <choose>
+                <!-- 当指定排序字段时使用指定字段排序 -->
+                <when test="sortField != null and sortField != ''">
+                    <choose>
+                        <!-- 对三种金币数量的排序处理 -->
+                        <when test="sortField == 'taskGold'">ugr.task_gold</when>
+                        <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <!-- 对时间字段的排序处理 -->
+                        <when test="sortField == 'createTime'">ugr.create_time</when>
+                        <!-- 其他字段不支持排序，使用默认排序 -->
+                        <otherwise>ugr.create_time</otherwise>
+                    </choose>
+
+                    <!-- 排序方向处理 -->
+                    <if test="sortOrder != null and sortOrder != ''">
+                        <choose>
+                            <when test="sortOrder == 'ASC'">ASC</when>
+                            <when test="sortOrder == 'DESC'">DESC</when>
+                            <otherwise>DESC</otherwise>
+                        </choose>
+                    </if>
+                    <if test="sortOrder == null or sortOrder == ''">
+                        DESC
+                    </if>
+                </when>
+
+                <!-- 未指定排序字段时，使用默认的时间降序排序 -->
+                <otherwise>
+                    ugr.create_time DESC
+                </otherwise>
+            </choose>
+        </trim>
+    </select>
+
+    <!-- 查询筛选后消费记录 -->
+    <select id="selectBy" resultType="com.example.demo.domain.vo.RefundUser">
+        SELECT u.name AS name,
+        u.jwcode AS jwcode,
+        u.market AS market,
+        ugr.order_code AS orderCode,
+        ugr.goods_name AS goodsName,
+        ugr.refund_model AS refundModel,
+        ugr.refund_type AS refundType,
+        ugr.sum_gold AS sumGold,
+        ugr.permanent_gold AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.task_gold AS taskGold,
+        ugr.remark AS remark,
+        a.admin_name AS adminName,
+        ugr.create_time AS createTime
+        FROM user u
+        JOIN
+        user_gold_record ugr ON u.jwcode = ugr.jwcode
+        JOIN
+        admin a ON ugr.admin_id = a.id
+        <where>
+            ugr.type = 2
+            <if test="jwcode != null and jwcode != ''">
+                AND ugr.jwcode = #{jwcode}
+            </if>
+            <if test="goodsName != null and goodsName != ''">
+                AND ugr.goods_name = #{goodsName}
+            </if>
+            <if test="market != null and market != ''">
+                AND u.market = #{market}
+            </if>
+            <if test="refundModel != null and refundModel != ''">
+                AND ugr.refund_model = #{refundModel}
+            </if>
+            <if test="startTime != null and endTime != null">
+                AND ugr.create_time BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
+        <trim prefix="ORDER BY" suffixOverrides=",">
+            <choose>
+                <!-- 当指定排序字段时使用指定字段排序 -->
+                <when test="sortField != null and sortField != ''">
+                    <choose>
+                        <!-- 对三种金币数量的排序处理 -->
+                        <when test="sortField == 'taskGold'">ugr.task_gold</when>
+                        <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
+                        <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
+                        <!-- 对时间字段的排序处理 -->
+                        <when test="sortField == 'createTime'">ugr.create_time</when>
+                        <!-- 其他字段不支持排序，使用默认排序 -->
+                        <otherwise>ugr.create_time</otherwise>
+                    </choose>
+
+                    <!-- 排序方向处理 -->
+                    <if test="sortOrder != null and sortOrder != ''">
+                        <choose>
+                            <when test="sortOrder == 'ASC'">ASC</when>
+                            <when test="sortOrder == 'DESC'">DESC</when>
+                            <otherwise>DESC</otherwise>
+                        </choose>
+                    </if>
+                    <if test="sortOrder == null or sortOrder == ''">
+                        DESC
+                    </if>
+                </when>
+
+                <!-- 未指定排序字段时，使用默认的时间降序排序 -->
+                <otherwise>
+                    ugr.create_time DESC
+                </otherwise>
+            </choose>
+        </trim>
+    </select>
+
+    <insert id="add" parameterType="com.example.demo.domain.entity.UserGoldRecord" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO user_gold_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            order_code,
+            jwcode,
+            refund_type,
+            refund_model,
+            sum_gold,
+            permanent_gold,
+            free_june,
+            free_december,
+            task_gold,
+            goods_name,
+            pay_platform,
+            remark,
+            type,
+            admin_id,
+            audit_status,
+            create_time
+        </trim>
+        VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{orderCode},
+            #{jwcode},
+            #{refundType},
+            #{refundModel},
+            #{sumGold},
+            #{permanentGold},
+            #{freeJune},
+            #{freeDecember},
+            #{taskGold},
+            #{goodsName},
+            #{payPlatform},
+            #{remark},
+            #{type},
+            #{adminId},
+            #{auditStatus},
+            #{createTime}
+        </trim>
+    </insert>
+
+    <select id="getRefundType" resultType="java.lang.String">
+        select DISTINCT refund_Type from user_gold_record
+    </select>
+
+    <select id="selectGoods" resultType="com.example.demo.domain.vo.RefundUser">
+        SELECT
+
+        ugr.goods_name AS goodsName,
+        ugr.order_code AS orderCode,
+        ugr.permanent_gold                                            AS permanentGold,
+        (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
+        ugr.task_gold                                                 AS taskGold
+        FROM user_gold_record ugr
+        <where>
+            ugr.type = 1
+            <if test="jwcode != null and jwcode != ''">
+                AND ugr.jwcode = #{jwcode}
+            </if>
+        </where>
+        <trim prefix="ORDER BY" suffixOverrides=",">
+                ugr.create_time DESC
+        </trim>
+    </select>
+</mapper>

src/main/resources/mapper/StatisticsMapper.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.StatisticsMapper">
+    <!--新增part2统计数据-->
+    <insert id="insertPart2">
+        INSERT INTO statistics (
+            market, current_datetime,
+            recharge,  money,
+            consume_permanent,  consume_free_june,
+            consume_free_december,  consume_task,
+            refund_permanent, refund_free_june,
+            refund_free_december,refund_task,
+            recharge_num,  first_recharge
+        ) VALUES (
+                     #{market},    #{currentDatetime},
+                     #{recharge},  #{money},
+                     #{consumePermanent}, #{consumeFreeJune},
+                     #{consumeFreeDecember}, #{consumeTask},
+                     #{refundPermanent}, #{refundFreeJune},
+                     #{refundFreeDecember}, #{refundTask},
+                     #{rechargeNum}, #{firstRecharge}
+                 )
+    </insert>
+    <!--新增part1统计数据-->
+    <insert id="insertPart1">
+        INSERT INTO statistics (
+            market, current_datetime,
+            current_gold, daily_change,
+            current_permanent, current_free_june,
+            current_free_december, current_task
+
+        ) VALUES (
+                     #{market},    #{currentDatetime},
+                     #{currentGold}, #{dailyChange},
+                     #{currentPermanent}, #{currentFreeJune},
+                     #{currentFreeDecember}, #{currentTask}
+
+                 )
+    </insert>
+    <!--更新part2统计数据-->
+    <update id="updatePart2" parameterType="map">
+        UPDATE statistics
+        SET
+            recharge = #{recharge},
+            money = #{money},
+            consume_permanent = #{consumePermanent},
+            consume_free_june = #{consumeFreeJune},
+            consume_free_december = #{consumeFreeDecember},
+            consume_task = #{consumeTask},
+            refund_permanent = #{refundPermanent},
+            refund_free_june = #{refundFreeJune},
+            refund_free_december = #{refundFreeDecember},
+            refund_task = #{refundTask},
+            recharge_num = #{rechargeNum},
+            first_recharge = #{firstRecharge}
+        WHERE market = #{market} and current_datetime = #{currentDatetime}
+    </update>
+    <!--更新part1统计数据-->
+    <update id="updatePart1" parameterType="map">
+        update statistics
+        SET
+            current_gold = #{currentGold},
+            daily_change = #{dailyChange},
+            current_permanent = #{currentPermanent},
+            current_free_june = #{currentFreeJune},
+            current_free_december = #{currentFreeDecember},
+            current_task = #{currentTask}
+        WHERE market = #{market} and current_datetime = #{currentDatetime}
+    </update>
+    <!--根据地区、审核状态、起止时间查询订单表数据-->
+    <select id="findByMarketAndAuditStatus"
+            resultType="com.example.demo.domain.entity.UserGoldRecord">
+        SELECT u.market, ugr.*
+        FROM user_gold_record ugr
+        INNER JOIN user u ON ugr.jwcode = u.jwcode
+        WHERE u.market = #{market}
+        AND ugr.audit_status IN
+        <foreach item="status" collection="auditStatusList" open="(" separator="," close=")">
+            #{status}
+        </foreach>
+        AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+    </select>
+   <!-- 计算该天充值人数-->
+    <select id="countRechargeNum" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT ugr.jwcode)
+        FROM user_gold_record ugr
+                 INNER JOIN user u ON ugr.jwcode = u.jwcode
+        WHERE u.market = #{market}
+          AND ugr.audit_status IN (1,3)
+          AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+    </select>
+    <!--计算该天首充人数-->
+    <select id="countFirstRecharge" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT ugr.jwcode)
+        FROM user_gold_record ugr
+                 INNER JOIN user u ON ugr.jwcode = u.jwcode
+        WHERE u.market = #{market}
+        AND ugr.audit_status = 1
+        AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+        AND u.first_recharge = #{startTime}
+    </select>
+    <select id="selectByMarketAndDate" resultType="com.example.demo.domain.entity.Statistics">
+        SELECT *
+        FROM statistics
+        WHERE market = #{market}
+        AND current_datetime >= #{startDate}
+        AND current_datetime  &lt;= #{endDate}
+        LIMIT 1
+    </select>
+    <select id="sumCurrentPermanentGold" resultType="java.lang.Integer">
+        SELECT SUM(user.current_permanent_gold)
+        FROM user
+        WHERE user.market = #{market}
+    </select>
+    <select id="sumCurrentFreeJune" resultType="java.lang.Integer">
+        SELECT SUM(u.current_free_june)
+        FROM user as u
+        WHERE u.market = #{market}
+    </select>
+    <select id="sumCurrentFreeDecember" resultType="java.lang.Integer">
+        SELECT SUM(u.current_free_december)
+        FROM user as u
+        WHERE u.market = #{market}
+    </select>
+    <select id="sumCurrentTaskGold" resultType="java.lang.Integer">
+        SELECT SUM(u.current_task_gold)
+        FROM user as u
+        WHERE u.market = #{market}
+    </select>
+    <select id="selectSumByMarketAndDate" resultType="com.example.demo.domain.entity.Statistics">
+        select sum(s.recharge) as recharge,
+               sum(s.money) as  money,
+                sum(s.consume_permanent) as consume_permanent,
+                sum(s.consume_free_june) as consume_free_june,
+                sum(s.consume_free_december) as consume_free_december,
+                sum(s.consume_task) as consume_task,
+                sum(s.recharge_num) as recharge_num
+        from statistics as s
+        WHERE market = #{market}
+          AND current_datetime >= #{startDate}
+          AND current_datetime  &lt;= #{endDate}
+    </select>
+
+</mapper>

src/main/resources/mapper/UserMapper.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.UserMapper">
+
+    <!-- 根据精网号查询用户信息 -->
+    <select id="selectUser" resultType="com.example.demo.domain.vo.GoldUser">
+        SELECT
+            name AS "name",
+            jwcode AS "jwcode",
+            market AS "market",
+            (COALESCE(current_permanent_gold, 0) + COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0) + COALESCE(current_task_gold, 0)) AS "nowSumGold",
+            current_permanent_gold AS "nowPermanentGold",
+            (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "nowFreeGold",
+            current_task_gold AS "nowTaskGold",
+            (COALESCE(sum_permanent_gold, 0) + COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0) + COALESCE(sum_task_gold, 0)) AS "historySumGold",
+            sum_permanent_gold AS "historyPermanentGold",
+            (COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0)) AS "historyFreeGold",
+            sum_task_gold AS "historyTaskGold",
+            recharge_num AS "rechargeNum",
+            consume_num AS "consumeNum",
+            first_recharge AS "firstRecharge"
+        FROM user
+        WHERE jwcode = #{jwcode}
+    </select>
+
+    <!-- 根据精网号查询金币余额 -->
+    <select id="selectGold" resultType="com.example.demo.domain.vo.GoldUser">
+        SELECT
+            current_permanent_gold AS "NowPermanentGold",
+            (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "NowFreeGold",
+            current_free_june AS "NowFreeJune",
+            current_free_december AS "NowFreeDecember",
+            current_task_gold AS "NowTaskGold",
+            consume_num AS "consumeNum"
+        FROM user
+        WHERE jwcode = #{jwcode}
+    </select>
+
+    <!-- 根据精网号更新数据 -->
+    <update id="updateGold" parameterType="com.example.demo.domain.entity.User">
+        UPDATE user
+        SET
+            current_permanent_gold = #{currentPermanentGold},
+            current_free_june = #{currentFreeJune},
+            current_free_december = #{currentFreeDecember},
+            current_task_gold = #{currentTaskGold},
+            consume_num = #{consumeNum},
+            sum_consume = sum_consume + #{sumConsume},
+            update_time = NOW()
+        WHERE jwcode = #{jwcode}
+    </update>
+</mapper>

src/main/resources/mapper/WorkBenchMapper.xml

@@ -1,5 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.demo.mapper.WorkBenchMapper">
+    <!--起止时间内的该地区充值金币数（永久+免费）若为空则默认0-->
+    <select id="sumRecharge" resultType="java.lang.Integer">
+        select sum(
+
+                       COALESCE(recharge, 0)
+               )
+        from statistics
+        where market = #{market}
+        and current_datetime
+            between #{startDate} and #{endDate}
+    </select>
+    <!--起止时间内的该地区充值金额（永久金币数）-->
+    <select id="sumMoney" resultType="java.lang.Integer">
+        SELECT SUM(money)
+        FROM statistics
+        WHERE market = #{market}
+          AND current_datetime BETWEEN #{startDate} and #{endDate}
+    </select>
+   <!-- 起止时间内该地区消费金币数（永久+免费+任务）-->
+    <select id="sumConsume" resultType="java.lang.Integer">
+        SELECT SUM(
+                       COALESCE(consume_permanent, 0) +
+                       COALESCE(consume_free_june, 0) +
+                       COALESCE(consume_free_december, 0) +
+                       COALESCE(consume_task, 0)
+               )
+        FROM statistics
+        WHERE market = #{market}
+          AND current_datetime BETWEEN
+            #{startDate} and #{endDate}
+    </select>
+    <!--起止时间内的该地区退款金币数（永久+免费+任务）-->
+    <select id="sumRefund" resultType="java.lang.Integer">
+        SELECT SUM(
+                       COALESCE(refund_permanent, 0) +
+                       COALESCE(refund_free_june, 0) +
+                       COALESCE(refund_free_december, 0) +
+                       COALESCE(refund_task, 0)
+               )
+        FROM statistics
+        WHERE market = #{market}
+          AND current_datetime BETWEEN
+            #{startDate} and #{endDate}
+    </select>
+    <!--起止时间内该地区充值人头数（根据精网号去重，老数据有多人共用一个精网号的问题）-->
+    <select id="countRechargeNum" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT ugr.jwcode)
+        FROM user_gold_record ugr
+                 INNER JOIN user u ON ugr.jwcode = u.jwcode
+        WHERE u.market = #{market}
+          AND ugr.pay_time BETWEEN
+            #{startDate} and #{endDate}
+        AND ugr.audit_status IN (1,3)
+
+    </select>
+    <!--给定时间范围内的该地区消费永久金币数-->
+    <select id="sumCPermanent" resultType="java.lang.Integer">
+        SELECT SUM(
+                       COALESCE(consume_permanent, 0)
+               )
+        FROM statistics
+        WHERE market = #{market}
+          AND current_datetime BETWEEN
+            #{startDate} and #{endDate}
+    </select>
+    <!--给定时间范围内的该地区消费免费金币数-->
+    <select id="sumCFree" resultType="java.lang.Integer">
+        SELECT SUM(
+                       COALESCE(refund_free_june, 0) +
+                       COALESCE(refund_free_december, 0)
+               )
+        FROM statistics
+        WHERE market = #{market}
+          AND current_datetime BETWEEN
+            #{startDate} and #{endDate}
+    </select>
+    <!--给定时间范围内的该地区消费任务金币数-->
+    <select id="sumCTask" resultType="java.lang.Integer">
+        SELECT SUM(
+                       COALESCE(refund_task, 0)
+               )
+        FROM statistics
+        WHERE market = #{market}
+          AND current_datetime BETWEEN
+            #{startDate} and #{endDate}
+    </select>
 
 </mapper>