From 7a2990bb5b0aecf2b7b4475348d00dc39c7b6229 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Mon, 2 Dec 2024 10:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/audit/mapper/AuditMapper.java |  6 ++--
 .../com/example/commons/domain/entity/Audit.java   |  2 +-
 .../com/example/commons/domain/entity/Detail.java  |  2 +-
 .../example/commons/domain/entity/Recharge.java    |  2 +-
 .../com/example/commons/domain/entity/User.java    |  2 +-
 .../example/commons/domain/vo/ConsumeDetail.java   |  2 +-
 .../java/com/example/commons/domain/vo/Page.java   |  2 ++
 .../com/example/commons/domain/vo/RechargeVo.java  |  2 +-
 .../com/example/commons/sevice/DetailService.java  |  2 +-
 .../example/recharge/mapper/RechargeMapper.java    |  6 ++--
 .../statistics/controller/DetailController.java    | 35 ++++++++++++++++++----
 .../example/statistics/mapper/DetailMapper.java    |  8 ++---
 .../statistics/service/DetailServiceImpl.java      |  9 +++++-
 .../java/com/example/user/mapper/UserMapper.java   |  2 +-
 14 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java
index 1c873c0..3baaace 100644
--- a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java
+++ b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java
@@ -14,9 +14,9 @@ public interface AuditMapper {
 
     @Insert({
             "INSERT INTO audit",
-            "(homily_id,recharge_id,refund_id,name,status,auditFlag)",
+            "(jwcode,recharge_id,refund_id,name,status,auditFlag)",
             "values",
-            "(#{homilyId},#{rechargeId},#{refundId},#{name},0,1)"
+            "(#{jwcode},#{rechargeId},#{refundId},#{name},0,1)"
     })
     int insert(Audit audit);
     @Update({
@@ -36,7 +36,7 @@ public interface AuditMapper {
             "select * from audit",
             "<where>",
 
-            "<if test='homilyId!=null'>and homily_id=#{homilyId}</if>",
+            "<if test='jwcode!=null'>and jwcode=#{jwcode}</if>",
             "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "<if test='rechargeId!=null'>and refund_id=#{fefundId}</if>",
             "<if test='refundId!=null'>and refund_id=#{fefundId}</if>",
diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java
index 6dc4675..f12004a 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java
@@ -11,7 +11,7 @@ import java.util.Date;
 @NoArgsConstructor
 public class Audit {
     private Integer auditId;
-    private Integer homilyId;
+    private Integer jwcode;
     private Integer rechargeId;
     private Integer refundId;
     private Integer adminId;
diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java
index 3a6dcef..2f2e96c 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java
@@ -12,7 +12,7 @@ import java.util.Date;
 public class Detail {
     private Integer detailId;
     private String name;
-    private String homilyId;
+    private String jwcode;
     private String area;
     private Integer activityId;
     private String rechargeWay;
diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java
index 181a7f0..b812f52 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java
@@ -11,7 +11,7 @@ import java.util.Date;
 @NoArgsConstructor
 public class Recharge {
     private Integer rechargeId;
-    private String homilyId;
+    private String jwcode;
     private Integer activityId;
     private Double paidGold;
     private Double freeGold;
diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/User.java b/demo/commons/src/main/java/com/example/commons/domain/entity/User.java
index bb79db0..ca15071 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/entity/User.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/entity/User.java
@@ -12,7 +12,7 @@ import java.util.Date;
 public class User {
     private Integer userId;
     private String name;
-    private String homilyId;
+    private String jwcode;
     private String password;
     private String phone;
     private String email;
diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java b/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java
index 1807ac5..a660df6 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java
@@ -11,7 +11,7 @@ import java.util.Date;
 public class ConsumeDetail {
     private Integer detailId;
     private String name;
-    private String homilyId;
+    private String jwcode;
     private String area;
     private Integer activityId;
     private String rechargeWay;
diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/Page.java b/demo/commons/src/main/java/com/example/commons/domain/vo/Page.java
index 22d7c11..37cd11b 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/vo/Page.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/vo/Page.java
@@ -2,6 +2,7 @@ package com.example.commons.domain.vo;
 
 import com.example.commons.domain.entity.Activity;
 import com.example.commons.domain.entity.Audit;
+import com.example.commons.domain.entity.Detail;
 import com.example.commons.domain.entity.Rate;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,4 +18,5 @@ public class Page {
     private Rate rate;
     private Audit audit;
     private ConsumeDetail consumeDetail;
+    private Detail detail;
 }
diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java
index 46b09b0..56bbcd6 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java
@@ -11,7 +11,7 @@ import java.util.Date;
 public class RechargeVo {
 
     private Integer rechargeId;
-    private String homilyId;
+    private String jwcode;
     private Integer activityId;
     private Double paidGold;
     private Double freeGold;
diff --git a/demo/commons/src/main/java/com/example/commons/sevice/DetailService.java b/demo/commons/src/main/java/com/example/commons/sevice/DetailService.java
index 105bf11..f73ebc4 100644
--- a/demo/commons/src/main/java/com/example/commons/sevice/DetailService.java
+++ b/demo/commons/src/main/java/com/example/commons/sevice/DetailService.java
@@ -9,6 +9,6 @@ public interface DetailService {
     int add(Detail detail);
     int edit(Detail detail);
     Detail getDetail(int id);
-    List<Detail> getAllDetail();
+    List<Detail> getAllDetail(Detail detail);
     PageInfo<Detail> getDetailByPage(int pageNum, int pageSize,Detail detail);
 }
diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java
index 6d1cf73..1ab9533 100644
--- a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java
+++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java
@@ -11,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,remark,flag)",
+            "(jwcode,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},#{remark},1)"
+            "(#{jwcode},#{activityId},#{paidGold},#{freeGold},#{rechargeGold},#{payWay},#{rechargeWay},#{rechargeTime},#{rechargeVoucher},#{adminId},#{area},#{remark},1)"
     })
     int insert(Recharge recharge);
 
@@ -32,7 +32,7 @@ public interface RechargeMapper {
             "<script>",
             "SELECT DISTINCT user.`name` as user_name , recharge.*,activity.activity_name,audit.`status`,audit.reson, 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 `user` ON recharge.jwcode = `user`.jwcode",
                     "INNER JOIN activity on recharge.activity_id = activity.activity_id",
                     "INNER JOIN `admin` on recharge.admin_id = `admin`.admin_id",
             "<where>",
diff --git a/demo/statistics/src/main/java/com/example/statistics/controller/DetailController.java b/demo/statistics/src/main/java/com/example/statistics/controller/DetailController.java
index e9ed569..3a62922 100644
--- a/demo/statistics/src/main/java/com/example/statistics/controller/DetailController.java
+++ b/demo/statistics/src/main/java/com/example/statistics/controller/DetailController.java
@@ -1,16 +1,41 @@
 package com.example.statistics.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.DetailService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
 
 @RestController
-@RequestMapping("/rates")
+@RequestMapping("/detail")
 @RequiredArgsConstructor
 @Slf4j
 @CrossOrigin
 public class DetailController {
-
+    private final DetailService detailService;
+    @PostMapping("/add")
+    public Result add(@RequestBody Detail detail) {
+        try {
+            detailService.add(detail);
+            return Result.success();
+        } catch (Exception e) {
+            log.warn(Arrays.toString(e.getStackTrace()));
+            return Result.error(e.getMessage());
+        }
+    }
+    @PostMapping
+    public Result search(@RequestBody Page page) {
+        if(ObjectUtils.isEmpty(page.getPageNum())){
+            return Result.success(detailService.getAllDetail(page.getDetail()));
+        }
+        else {
+            return Result.success(detailService.getDetailByPage(page.getPageNum(), page.getPageSize(), page.getDetail()));
+        }
+    }
 }
diff --git a/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java b/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java
index 6107403..cf0195b 100644
--- a/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java
+++ b/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java
@@ -12,10 +12,10 @@ public interface DetailMapper {
 
     @Insert({
     "insert into detail",
-            "(homily_id,area,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods," +
+            "(jwcode,area,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods," +
                     "cntact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,create_time)",
             "values ",
-            "(#{homilyId},#{area},#{activityId},#{rechargeId},#{productId},#{area},#{consumePlatform},#{consumeType},#{refundType}" +
+            "(#{jwcode},#{area},#{activityId},#{rechargeId},#{productId},#{area},#{consumePlatform},#{consumeType},#{refundType}" +
                     ",#{refundGoods},#{cntactId},#{remark},#{rechargeCoin}" +
                     ",#{freeCoin},#{taskCoin},#{adminId},#{updateType},#{detailFlag},#{createTime}",
     })
@@ -28,9 +28,9 @@ public interface DetailMapper {
             "<script>",
         "select detail.*,admin.name,admin.area from detail",
             "inner join `admin` on detail.admin_id = `admin`.admin_id",
-            "inner join `user` on detail.homily_id = `user`.homily_id",
+            "inner join `user` on detail.jwcode = `user`.jwcode",
             "<where>",
-            "<if test='homilyId!=null'>and detail.homily_id=#{homilyId}</if>",
+            "<if test='jwcode!=null'>and detail.jwcode=#{jwcode}</if>",
             "<if test='updateType!=null and updateType>0'>and update_type=#{updateType}</if>",
             "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "</where>",
diff --git a/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java b/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java
index b171539..7718a6b 100644
--- a/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java
+++ b/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java
@@ -3,9 +3,15 @@ package com.example.statistics.service;
 import com.example.commons.domain.entity.Detail;
 import com.example.commons.sevice.DetailService;
 import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+@Service
+@Transactional
+@RequiredArgsConstructor
 public class DetailServiceImpl implements DetailService {
     @Override
     public int add(Detail detail) {
@@ -23,10 +29,11 @@ public class DetailServiceImpl implements DetailService {
     }
 
     @Override
-    public List<Detail> getAllDetail() {
+    public List<Detail> getAllDetail(Detail detail) {
         return List.of();
     }
 
+
     @Override
     public PageInfo<Detail> getDetailByPage(int pageNum, int pageSize, Detail detail) {
         return null;
diff --git a/demo/user/src/main/java/com/example/user/mapper/UserMapper.java b/demo/user/src/main/java/com/example/user/mapper/UserMapper.java
index 2bd6966..e4d4585 100644
--- a/demo/user/src/main/java/com/example/user/mapper/UserMapper.java
+++ b/demo/user/src/main/java/com/example/user/mapper/UserMapper.java
@@ -10,7 +10,7 @@ import java.util.List;
 @Mapper
 public interface UserMapper {
     @Select({
-            "select * from user where homily_id=#{homilyId}"
+            "select * from user where jwcode=#{jwcode}"
     })
     List<User> select(User user);
 }