后端框架第三版接口

demo/admin/src/main/resources/application.yml

@@ -3,8 +3,13 @@ server:
 
 spring:
   datasource:
-    hikari:
-      maximum-pool-size: 50
+    hikari: # HikariCP连接池配置
+      maximum-pool-size: 10 # 最大连接数
+      minimum-idle: 5 # 最小空闲连接数
+      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
+      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）
+      pool-name: HwgoldHikariCP # 连接池名称
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username:  hwgold

demo/audit/src/main/resources/application.yml

@@ -3,8 +3,13 @@ server:
 
 spring:
   datasource:
-    hikari:
-      maximum-pool-size: 50
+    hikari: # HikariCP连接池配置
+      maximum-pool-size: 10 # 最大连接数
+      minimum-idle: 5 # 最小空闲连接数
+      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
+      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）
+      pool-name: HwgoldHikariCP # 连接池名称
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username:  hwgold

demo/commons/src/main/java/com/example/commons/sevice/RefundService.java

@@ -1,6 +1,7 @@
 package com.example.commons.sevice;
 
 import com.example.commons.domain.entity.Detail;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
 
@@ -11,6 +12,7 @@ public interface RefundService {
     int add(Detail detail) ;
     int addAudit(Detail detail);
     void edit(Detail newDetail) ;
+    boolean existsByContactId(Integer contactId);
     int softDelete(Integer detailId) ;
     Detail selectByDetailId(Integer detailId);
     List<Detail> search(Detail detail);

demo/consume/src/main/resources/application.yml

@@ -3,8 +3,13 @@ server:
 
 spring:
   datasource:
-    hikari:
-      maximum-pool-size: 50
+    hikari: # HikariCP连接池配置
+      maximum-pool-size: 10 # 最大连接数
+      minimum-idle: 5 # 最小空闲连接数
+      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
+      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）
+      pool-name: HwgoldHikariCP # 连接池名称
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=GMT%2b8&serverTimezone=Asia/Shanghai
     username:  hwgold

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

@@ -49,7 +49,7 @@ public interface RechargeMapper {
     })
     List<RechargeVo> select(RechargeVo rechargeVo);
 //根据jwcode和充值类型判断有没有，有首充标识设为0，否者设为1
-    @Select({"select * from detail",
+    @Select({"select count(*) from detail",
             "where jwcode=#{jwcode} and update_type='充值'"})
     int getAllByjwAndup(String jwcode);
 }

demo/recharge/src/main/resources/application.yml

@@ -3,8 +3,13 @@ server:
 
 spring:
   datasource:
-    hikari:
-      maximum-pool-size: 50
+    hikari: # HikariCP连接池配置
+      maximum-pool-size: 10 # 最大连接数
+      minimum-idle: 5 # 最小空闲连接数
+      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
+      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）
+      pool-name: HwgoldHikariCP # 连接池名称
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username:  hwgold

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

@@ -1,17 +1,16 @@
 package com.example.refund.controller;
 
-
 import com.example.commons.domain.entity.Detail;
+
 import com.example.commons.domain.vo.Page;
 import com.example.commons.domain.vo.Result;
 import com.example.commons.sevice.RefundService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
-
 import java.util.Arrays;
 
 @RestController
@@ -25,6 +24,9 @@ public class RefundController {
     @PostMapping("/add")
     public Result add(@RequestBody Detail detail) {
 //        try {
+        if (refundService.existsByContactId(detail.getContactId())) {
+            return Result.error("该订单已退款: " + detail.getContactId());
+        }
         refundService.add(detail);
         refundService.addAudit(detail);
         return Result.success();
@@ -37,6 +39,12 @@ public class RefundController {
     @PostMapping("/softDelete")
     public Result softDelete(@RequestParam Integer detailId) {
 //        try {
+        // 获取旧的明细记录
+        Detail oldDetail = refundService.selectByDetailId(detailId);
+
+        if (oldDetail == null || oldDetail.getDetailFlag() ==0) {
+            return Result.error("该订单不存在: " + detailId);
+        }
         refundService.softDelete(detailId);
         return Result.success();
 //        } catch (Exception e) {
@@ -51,8 +59,7 @@ public class RefundController {
             refundService.edit(newDetail);
             return Result.success();
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
+            log.warn(Arrays.toString(e.getStackTrace()));
             return Result.error(e.getMessage());
         }
     }

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

@@ -10,21 +10,25 @@ public interface RefundMapper {
 
     @Insert({
             "insert into detail",
-            "(jwcode,refund_type,refund_goods,recharge_coin,free_coin,task_coin,remark,admin_id,create_time,update_type)",
+            "(jwcode,refund_type,refund_goods,contact_id,recharge_coin,free_coin,task_coin,remark,admin_id,create_time,update_type)",
             "values",
-            "(#{jwcode},#{refundType},#{refundGoods},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),'退款')"
+            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),'退款')"
     })
     @Options(useGeneratedKeys = true, keyColumn = "detail_id", keyProperty = "detailId")
     int insert(Detail detail);
 
-    @Select({
+    @Insert({
             "insert into audit",
             "(jwcode,refund_id,admin_id,create_time,detail_id)",
             "values",
-            "(,#{jwcode},#{refundId},#{adminId},now(),#{detailId})"
+            "(#{jwcode},#{detailId},#{adminId},now(),#{detailId})"
     })
     int insertAudit(Detail detail);
 
+    // 检查 contactId 是否存在
+    @Select("SELECT EXISTS (SELECT 1 FROM detail WHERE contact_id = #{contactId})")
+    boolean existsByContactId(@Param("contactId") Integer contactId);
+
     @Update("update detail set detail_flag = 0 where detail_id = #{detailId}")
     int update(@Param("detailId") Integer detailId);
 

demo/refund/src/main/java/com/example/refund/service/RefundServiceImpl.java

@@ -58,6 +58,11 @@ public class RefundServiceImpl implements RefundService {
     }
 
     @Override
+    public boolean existsByContactId(Integer contactId) {
+        return refundMapper.existsByContactId(contactId);
+    }
+
+    @Override
     public int softDelete(Integer detailId)  {
         return refundMapper.update(detailId);
     }

demo/refund/src/main/resources/application.yml

@@ -3,8 +3,13 @@ server:
 
 spring:
   datasource:
-    hikari:
-      maximum-pool-size: 50
+    hikari: # HikariCP连接池配置
+      maximum-pool-size: 10 # 最大连接数
+      minimum-idle: 5 # 最小空闲连接数
+      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
+      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）
+      pool-name: HwgoldHikariCP # 连接池名称
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username:  hwgold

demo/statistics/pom.xml

@@ -66,14 +66,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                </configuration>
             </plugin>
         </plugins>
     </build>

demo/statistics/src/main/resources/application.yml

@@ -3,9 +3,13 @@ server:
 
 spring:
   datasource:
-    hikari:
-      maximum-pool-size: 50
-
+    hikari: # HikariCP连接池配置
+      maximum-pool-size: 10 # 最大连接数
+      minimum-idle: 5 # 最小空闲连接数
+      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
+      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）
+      pool-name: HwgoldHikariCP # 连接池名称
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username:  hwgold

demo/user/src/main/resources/application.yml

@@ -2,8 +2,13 @@ server:
   port: 10020
 spring:
   datasource:
-    hikari:
-      maximum-pool-size: 50
+    hikari: # HikariCP连接池配置
+      maximum-pool-size: 10 # 最大连接数
+      minimum-idle: 5 # 最小空闲连接数
+      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
+      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
+      connection-timeout: 30000 # 连接超时时间（毫秒）
+      pool-name: HwgoldHikariCP # 连接池名称
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username:  hwgold