楼上接口+商品查询修改

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

@@ -84,7 +84,13 @@ public class ConsumeController {
     @PostMapping("/add")
     public Result add(@RequestBody ConsumeUser consumeUser) {
         try {
+            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/RefundController.java

@@ -85,7 +85,7 @@ public class RefundController {
     @PostMapping("/selectGoods")
     public Result getSelectGoods(@RequestBody RefundUser refundUser)
     {
-        List<String> list = refundService.selectGoods(refundUser.getJwcode());
+        List<RefundUser> list = refundService.selectGoods(refundUser.getJwcode());
         return Result.success(list);
     }
 

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

@@ -27,6 +27,6 @@ public interface RefundMapper {
 
     List<String> getRefundType();
 
-    List<UserGoldRecord> selectGoods(Integer jwcode);
+    List<RefundUser> selectGoods(Integer jwcode);
 
 }

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

@@ -31,5 +31,5 @@ public interface RefundService {
     //获取退款类型
     List<String> getRefundType();
 
-    List<String> selectGoods(Integer jwcode);
+    List<RefundUser> selectGoods(Integer jwcode);
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -14,6 +15,7 @@ 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;
@@ -158,6 +160,10 @@ public class ConsumeServiceImpl implements ConsumeService {
         user.setConsumeNum(gold.getConsumeNum() + 1);
         user.setSumConsume(consumeUser.getPermanentGold() + consumeUser.getFreeGold() + consumeUser.getTaskGold());
         userMapper.updateGold(user);
+        //对接接口
+        GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
+                userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember()+userGoldRecord.getFreeJune()+userGoldRecord.getTaskGold(),
+                userGoldRecord.getRemark(),userGoldRecord.getPermanentGold(), userGoldRecord.getPayPlatform(), userGoldRecord.getGoodsName());
         return Result.success();
     }
 }

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

@@ -142,10 +142,10 @@ public class RefundServiceImpl implements RefundService {
     }
 
     @Override
-    public List<String> selectGoods(Integer jwcode) {
-        List<UserGoldRecord> userGoldRecords = refundMapper.selectGoods(jwcode);
-        List<String> list = new ArrayList<>();
-        for (UserGoldRecord record : userGoldRecords) {
+    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;
             }
@@ -155,7 +155,12 @@ public class RefundServiceImpl implements RefundService {
 
             // 拼接格式：订单号_商品名（例如：XF20250629_商品BC）
             String combined = orderCode + "_" + goodsName;
-            list.add(combined);
+            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/resources/application.yml

@@ -4,9 +4,9 @@ spring:
       fail-on-unknown-properties: false
   datasource:
     mysql1:
-      jdbc-url: jdbc:mysql://192.168.8.220: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

src/main/resources/mapper/RechargeMapper.xml

@@ -19,7 +19,7 @@
         ugr.remark AS remark,
         ugr.admin_id AS adminId,
         a.admin_name AS adminName,
-        ugr.create_time AS createTime
+        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
@@ -35,9 +35,9 @@
                         <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>
+                        <when test="sortField == 'payTime'">ugr.pay_time</when>
                         <!-- 其他字段不支持排序，使用默认排序 -->
-                        <otherwise>ugr.create_time</otherwise>
+                        <otherwise>ugr.pay_time</otherwise>
                     </choose>
 
                     <!-- 排序方向处理 -->
@@ -55,7 +55,7 @@
 
                 <!-- 未指定排序字段时，使用默认的时间降序排序 -->
                 <otherwise>
-                    ugr.create_time DESC
+                    ugr.pay_time DESC
                 </otherwise>
             </choose>
         </trim>
@@ -78,7 +78,7 @@
         ugr.remark AS remark,
         ugr.admin_id AS adminId,
         a.admin_name AS adminName,
-        ugr.create_time AS createTime
+        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
@@ -98,7 +98,7 @@
                 AND ugr.pay_platform = #{payPlatform}
             </if>
             <if test="startTime != null and endTime != null">
-                AND ugr.create_time BETWEEN #{startTime} AND #{endTime}
+                AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
             </if>
         </where>
         <trim prefix="ORDER BY" suffixOverrides=",">
@@ -110,9 +110,9 @@
                         <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>
+                        <when test="sortField == 'payTime'">ugr.pay_time</when>
                         <!-- 其他字段不支持排序，使用默认排序 -->
-                        <otherwise>ugr.create_time</otherwise>
+                        <otherwise>ugr.pay_time</otherwise>
                     </choose>
 
                     <!-- 排序方向处理 -->
@@ -130,7 +130,7 @@
 
                 <!-- 未指定排序字段时，使用默认的时间降序排序 -->
                 <otherwise>
-                    ugr.create_time DESC
+                    ugr.pay_time DESC
                 </otherwise>
             </choose>
         </trim>

src/main/resources/mapper/RefundMapper.xml

@@ -180,10 +180,13 @@
         select DISTINCT refund_Type from user_gold_record
     </select>
 
-    <select id="selectGoods" resultType="com.example.demo.domain.entity.UserGoldRecord">
+    <select id="selectGoods" resultType="com.example.demo.domain.vo.RefundUser">
         SELECT
         ugr.goods_name AS goodsName,
-        ugr.order_code AS orderCode
+        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