后端框架第一版接口

demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java

@@ -17,7 +17,9 @@ public class Activity {
     private String activityName;
     private BigDecimal rechargeRatio;
     private LocalDateTime createTime;
-    private int flag;
+    private int activityFlag;
 
+    private String name;
+    private Integer status;
 
 }

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

@@ -0,0 +1,23 @@
+package com.example.commons.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class Admin {
+    private Integer adminId;
+    private String name;
+    private String username;
+    private String password;
+    private String permission;
+    private String area;
+    private String adminFlag;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+}

demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java

@@ -16,7 +16,7 @@ public class Audit {
     private Integer refundId;
     private String name;
     private String status;
-    private Integer flag;
+    private Integer AuditFlag;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;

demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java

@@ -29,7 +29,7 @@ public class Detail {
     private String conmmitName;
     private Integer status;
     private String updateType;
-    private Integer flag;
+    private Integer detailFlag;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;

demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java

@@ -22,7 +22,7 @@ public class Recharge {
     private String rechargeVoucher;
     private Integer adminId;
     private String area;
-    private Integer status;
+
     private String remark;
     private Integer flag;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -30,4 +30,5 @@ public class Recharge {
     private Date createTime;
     private Date startDate;
     private Date endDate;
+
 }

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

@@ -19,7 +19,7 @@ public class User {
     private String gender;
     private Date birthday;
     private String head;
-    private Integer flag;
+    private Integer UserFlag;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;

demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java

@@ -0,0 +1,38 @@
+package com.example.commons.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+@Data
+@NoArgsConstructor
+public class RechargeVo {
+
+    private Integer rechargeId;
+    private String homilyId;
+    private Integer activityId;
+    private Double paidGold;
+    private Double freeGold;
+    private Double rechargeGold;
+    private String payWay;
+    private String rechargeWay;
+    private Date rechargeTime;
+    private String rechargeVoucher;
+    private Integer adminId;
+    private String area;
+
+    private String remark;
+    private Integer flag;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    private Date startDate;
+    private Date endDate;
+    private String username;
+    private String activityName;
+    private String name;
+    private Integer status;
+    private String reson;
+}

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

@@ -1,6 +1,7 @@
 package com.example.commons.sevice;
 
 import com.example.commons.domain.entity.Recharge;
+import com.example.commons.domain.vo.RechargeVo;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
@@ -10,6 +11,6 @@ public interface RechargeService {
     int edit(Recharge recharge) throws Exception;
 
     Recharge findById(int id) throws Exception;
-    List<Recharge> search(Recharge recharge) ;
-    PageInfo<Recharge> searchForPage(Integer pageNum, Integer pageSize, Recharge recharge);
+    List<RechargeVo> search(RechargeVo rechargeVo) ;
+    PageInfo<RechargeVo> searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo);
 }

demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 // lombok的，添加一个包含所有final属性的构造器
 @Slf4j  //lombok的，自动添加log的对象，用于日志打印
-
+@CrossOrigin
 public class ActivityController {
 
     @Autowired

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

@@ -2,6 +2,7 @@ package com.example.recharge.controller;
 
 
 import com.example.commons.domain.entity.Recharge;
+import com.example.commons.domain.vo.RechargeVo;
 import com.example.commons.domain.vo.Result;
 import com.example.commons.sevice.RechargeService;
 import lombok.RequiredArgsConstructor;
@@ -41,12 +42,12 @@ public class RechargeController {
         return Result.success();
     }
     @PostMapping
-    public Result search(Integer pageNum, Integer pageSize,@RequestBody Recharge recharge) {
+    public Result search(Integer pageNum, Integer pageSize,@RequestBody RechargeVo rechargeVo) {
         if(ObjectUtils.isEmpty(pageNum)){
-            return Result.success(rechargeService.search(recharge));
+            return Result.success(rechargeService.search(rechargeVo));
         }
         else {
-            return Result.success(rechargeService.searchForPage(pageNum,pageSize,recharge));
+            return Result.success(rechargeService.searchForPage(pageNum,pageSize,rechargeVo));
         }
     }
 }

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

@@ -11,7 +11,7 @@ public interface ActivityMapper {
 
     //增加活动信息
     @Insert({"insert into activity",
-            "(admin_id,dept,start_time,end_time,recharge_ratio,activity_name,flag,create_time) " ,
+            "(admin_id,dept,start_time,end_time,recharge_ratio,activity_name,activity_flag,create_time) " ,
             "values",
             "(#{adminId},#{dept},#{startTime},#{endTime},#{rechargeRatio},#{activityName},1,now())"
     })
@@ -30,7 +30,8 @@ public interface ActivityMapper {
            "<if test='endTime != null '> end_time = #{endTime}, </if>",
            "<if test='rechargeRatio != null '> recharge_ratio = #{rechargeRatio}, </if>",
            "<if test='activityName != null and activityName.length>0'> activity_name = #{activityName}, </if>",
-           "<if test='flag != null'> `flag` = #{flag}, </if>",
+           "<if test='activityFlag != null'> `activity_flag` = #{activityFlag}, </if>",
+           "<if test='status != null'> `status` = #{status}, </if>",
            "</set>",
            "where activity_id=#{activityId}",
            "</script>"
@@ -47,7 +48,8 @@ public interface ActivityMapper {
     //模糊查询--根据活动id查询活动信息
     @Select({
             "<script>",
-            "select * from activity",
+            "select activity.*,admin.name from activity",
+            "inner join admin on activity.admin_id=admin.admin_id ",
             "<where>",
             "<if test='startTime!=null'>start_time=#{startTime}</if>",
             "<if test='endTime!=null'>and end_time=#{endTime}</if>",

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

@@ -14,9 +14,9 @@ public interface AuditMapper {
 
     @Insert({
             "INSERT INTO audit",
-            "(homily_id,recharge_id,refund_id,name,status,flag)",
+            "(homily_id,recharge_id,refund_id,name,status,auditFlag)",
             "values",
-            "(#{homilyId},#{rechargeId},#{refundId},#{name},#{status},#{flag})"
+            "(#{homilyId},#{rechargeId},#{refundId},#{name},#{status},1)"
     })
     int insert(Audit audit);
     @Select({

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

@@ -1,10 +1,8 @@
 package com.example.recharge.mapper;
 
 import com.example.commons.domain.entity.Recharge;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import com.example.commons.domain.vo.RechargeVo;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -13,9 +11,9 @@ public interface RechargeMapper {
 
     @Insert({
             "INSERT INTO recharge",
-            "(homily_id,activity_id,paid_gold,free_gold,recharge_gold,pay_way,recharge_way,recharge_time,recharge_voucher,admin_id,area,status,remark,flag)",
+            "(homily_id,activity_id,paid_gold,free_gold,recharge_gold,pay_way,recharge_way,recharge_time,recharge_voucher,admin_id,area,remark,flag)",
             "values ",
-            "(#{homilyId},#{activityId},#{paidGold},#{freeGold},#{rechargeGold},#{payWay},#{rechargeWay},#{rechargeTime},#{rechargeVoucher},#{adminId},#{area},#{status},#{remark},#{flag})"
+            "(#{homilyId},#{activityId},#{paidGold},#{freeGold},#{rechargeGold},#{payWay},#{rechargeWay},#{rechargeTime},#{rechargeVoucher},#{adminId},#{area},#{remark},1)"
     })
     int insert(Recharge recharge);
 
@@ -32,16 +30,20 @@ public interface RechargeMapper {
 
     @Select({
             "<script>",
-            "select * from recharge",
+            "SELECT user.`name` as user_name , recharge.*,activity.activity_name,audit.`status`, admin.`name`  FROM recharge",
+                    "INNER JOIN audit ON recharge.recharge_id = audit.recharge_id",
+                    "INNER JOIN `user` ON recharge.homily_id = `user`.homily_id",
+                    "INNER JOIN activity on recharge.activity_id = activity.activity_id",
+                    "INNER JOIN admin on recharge.admin_id = admin.admin_id",
             "<where>",
             "flag='1'",
             "<if test='activityId!=null'>and activity_id=#{activityId}</if>",
             "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "<if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>",
             "<if test='area!=null and area.length>0'>and area like concat('%',#{area},'%')</if>",
-            "<if test='status!=null'>and status=#{status}</if>",
+            "<if test='status!=null'>and audit.status=#{status}</if>",
             "</where>",
             "</script>"
     })
-    List<Recharge> select(Recharge recharge);
+    List<RechargeVo> select(RechargeVo rechargeVo);
 }

demo/recharge/src/main/java/com/example/recharge/service/ActivityServiceImpl.java

@@ -13,6 +13,9 @@ import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageInfo;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -40,8 +43,26 @@ public class ActivityServiceImpl implements ActivityService {
 
 
     public PageInfo<Activity> searchForPage(Integer pageNum, Integer pageSize, Activity activity) {
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<Activity> list = activityMapper.select(activity);
+//        return new PageInfo<>(list);
+
         PageHelper.startPage(pageNum, pageSize);
         List<Activity> list = activityMapper.select(activity);
+        LocalDate nowDate = LocalDate.now(); // 获取当前的 LocalDate
+        list.stream()
+                .forEach(activity1 -> {
+                    if (nowDate.isBefore(activity1.getStartTime())) {
+                        // 假设 Activity 类有一个 setStatus 方法来设置状态
+                        activity1.setStatus(0); // 设置新的状态
+                        activityMapper.edit(activity1); // 保存修改后的对象
+                    }
+                    else if(nowDate.isAfter(activity1.getEndTime())) {
+                        // 假设 Activity 类有一个 setStatus 方法来设置状态
+                        activity1.setStatus(2); // 设置新的状态
+                        activityMapper.edit(activity1); // 保存修改后的对象
+                    }
+                });
         return new PageInfo<>(list);
     }
 }

demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.example.recharge.service;
 
 import com.example.commons.domain.entity.Recharge;
+import com.example.commons.domain.vo.RechargeVo;
 import com.example.commons.sevice.RechargeService;
 import com.example.recharge.mapper.RechargeMapper;
 import com.github.pagehelper.PageHelper;
@@ -31,14 +32,14 @@ public class RechargeServiceImpl implements RechargeService {
     }
 
     @Override
-    public List<Recharge> search(Recharge recharge) {
-        return rechargeMapper.select(recharge);
+    public List<RechargeVo> search(RechargeVo rechargeVo) {
+        return rechargeMapper.select(rechargeVo);
     }
 
     @Override
-    public PageInfo<Recharge> searchForPage(Integer pageNum, Integer pageSize, Recharge recharge) {
+    public PageInfo<RechargeVo> searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo) {
         PageHelper.startPage(pageNum,pageSize);
-        List<Recharge> list= rechargeMapper.select(recharge);
+        List<RechargeVo> list= rechargeMapper.select(rechargeVo);
         return new PageInfo<>(list);
     }
 }