新增充值和活动查询

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

@@ -47,4 +47,10 @@ public class GeneralController {
         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/domain/vo/RechargeUser.java

@@ -34,12 +34,13 @@ public class RechargeUser {
     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 createTime; // 创建时间
+    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")

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

@@ -17,4 +17,5 @@ public interface GeneralMapper {
     List<String> getMarket();
     List<String> getPlatform();
     List<String> getGoods();
+    List<String> getActivity();
 }

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

@@ -20,7 +20,10 @@ public interface GeneralService {
     List<String> getMarket();
     //获取平台
     List<String> getPlatform();
+    //获取商品
     List<String> getGoods();
+    //获取活动
+    List<String> getActivity();
     //获取昨天的日期
     Date getYesterday();
     //获取某天的开始时间(00:00:00)

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

@@ -45,6 +45,13 @@ public class GeneralServiceImpl implements GeneralService {
         return list;
     }
 
+    @Override
+    public List<String> getActivity() {
+        List<String> list = generalMapper.getActivity();
+        return list;
+    }
+
+
     /*
     获取昨天的日期
      */

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

@@ -1,9 +1,8 @@
 package com.example.demo.serviceImpl;
 
-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.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;
@@ -13,7 +12,12 @@ 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
@@ -79,6 +83,49 @@ public class RechargeServiceImpl implements RechargeService {
 
     @Override
     public Result add(RechargeUser rechargeUser) {
-        return null;
+        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/resources/mapper/GeneralMapper.xml

@@ -11,4 +11,7 @@
     <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/RechargeMapper.xml

@@ -141,39 +141,43 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             order_code,
             jwcode,
+            activity,
             sum_gold,
             permanent_gold,
             free_june,
             free_december,
-            task_gold,
-            goods_name,
-            remark,
-            type,
+            rate_id,
+            money,
+            voucher,
             pay_platform,
-            is_refund,
+            pay_model,
+            pay_time,
+            remark,
             admin_id,
+            type,
             audit_status,
-            create_time,
-            pay_time
+            create_time
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
             #{orderCode},
             #{jwcode},
+            #{activity},
             #{sumGold},
             #{permanentGold},
             #{freeJune},
             #{freeDecember},
-            #{taskGold},
-            #{goodsName},
-            #{remark},
-            #{type},
+            #{rateId},
+            #{money},
+            #{voucher},
             #{payPlatform},
-            #{isRefund},
+            #{payModel},
+            #{payTime},
+            #{remark},
             #{adminId},
+            #{type},
             #{auditStatus},
-            #{createTime},
-            #{payTime}
+            #{createTime}
         </trim>
     </insert>
 </mapper>