后端整合模块

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

@@ -87,8 +87,11 @@ public class  AuditController {
                user.setFree12(user.getFree12().add(freeCoin)); // 在7月到12月时返回的值
             }
             detail.setUsername(user1.getName()); // 获取 user 的 name 设置到 detail 的 username
+            System.out.println(user1.getName()+"------------------------------");
             detail.setArea(user1.getArea()); // 获取 user 的 area 设置到 detail 的 area
-            detail.setAdminName(detail.getAdminName());
+            System.out.println(user1.getArea()+"------------------------------");
+            detail.setName(detail.getAdminName());
+            System.out.println(detail.getAdminName()+"------------------------------");
             refundMapper.inserty(detail);
             userMapper.update(user);
         }

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

@@ -45,7 +45,7 @@ private BigDecimal rechargeGold;
     private String rechargeWay;
     private String rechargeVoucher;
     private String rechargeTime;
-
+    private String adminName;
 
 
 

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

@@ -43,7 +43,7 @@ public class Detail implements Serializable {
     private Date startDate;
     private String uname;
     private Integer firstRecharge;
-
+    private String createAdmin;
     private String adminArea;
     private String adminName;
     private String userName;
@@ -70,4 +70,5 @@ public class Detail implements Serializable {
 
 
 
+
 }

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

@@ -62,13 +62,15 @@ public interface ActivityMapper {
             "<if test='activityId != null'>",
             "AND activity.activity_id = #{activityId}",
             "</if>",
+            "<if test='status != null'>",
+            "AND status = #{status}",
+            "</if>",
             "</where>",
 //            "ORDER BY activity.status,activity.create_time DESC,activity.start_time DESC",
             "ORDER BY CASE WHEN activity.activity_name = '无赠送活动' THEN 0 ELSE 1 END, activity.status, activity.create_time DESC, activity.start_time DESC",
             "</script>"
     })
     List<Activity> select(Activity activity);
-    //
 
 
 }

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

@@ -48,7 +48,7 @@ public interface RechargeMapper {
     @Select({
             "<script>",
             "SELECT user.`name` as user_name,recharge.jwcode,recharge.create_time,recharge.recharge_time," +
-                    "recharge.recharge_way,recharge.remark,recharge.paid_gold,recharge.free_gold,recharge.pay_way,recharge.recharge_voucher," +
+                    "recharge.recharge_way,recharge.remark,recharge.paid_gold,recharge.free_gold,recharge.recharge_gold,recharge.pay_way,recharge.recharge_voucher," +
                     "recharge.recharge_id,recharge.activity_id,recharge.admin_id,activity.activity_name,audit.`status`,audit.audit_id,audit.reson, admin.name,user.area,audit.detail_id  FROM recharge",
                     "LEFT JOIN audit ON recharge.recharge_id = audit.recharge_id",
                     "LEFT JOIN `user` ON recharge.jwcode = `user`.jwcode",

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

@@ -21,9 +21,9 @@ public interface RefundMapper {
 
     @Insert({
             "insert into detail_y",
-            "(jwcode,refund_type,refund_goods,contact_id,recharge_coin,free_coin,task_coin,remark,admin_id,create_time,update_type,order_code,area,username,name,consume_platform,username.area,name)",
+            "(jwcode,refund_type,refund_goods,contact_id,recharge_coin,free_coin,task_coin,remark,admin_id,create_time,update_type,order_code,area,username,name,consume_platform)",
             "values",
-            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode},#{area},#{username},#{adminName},'客服退款',#{username},{area},#{adminName})"
+            "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode},#{area},#{username},#{name},'客服退款')"
     })
     @Options(useGeneratedKeys = true, keyColumn = "detaily_id", keyProperty = "detailyId")
     int inserty(Detail detail);