From 589ee68088e82a6966299cfe8f0b120759734560 Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Sat, 4 Jan 2025 09:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/mapper/DetailYMapper.java | 2 +- src/main/java/com/example/demo/mapper/RefundMapper.java | 2 +- src/main/java/com/example/demo/mapper/StatisticsMapper.java | 4 ++-- src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 2 +- src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java | 8 ++++---- .../java/com/example/demo/serviceImpl/RechargeServiceImpl.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index cc207bd..da5354e 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -69,7 +69,7 @@ public interface DetailYMapper { "and detail_y.jwcode=#{jwcode}", "and update_type=#{updateType}", "AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}", - + "and consume_platform=#{consumePlatform}", "", "ORDER BY detaily_id desc", "" diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java index afe80de..7b20467 100644 --- a/src/main/java/com/example/demo/mapper/RefundMapper.java +++ b/src/main/java/com/example/demo/mapper/RefundMapper.java @@ -23,7 +23,7 @@ public interface RefundMapper { "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)", "values", - "(#{jwcode},#{refundType},#{refundGoods},#{contactId},#{rechargeCoin},#{freeCoin},#{taskCoin},#{remark},#{adminId},now(),2,#{orderCode},#{area},#{username},#{name},'客服退款')" + "(#{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); diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java index 328b48c..e51da67 100644 --- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java +++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java @@ -24,7 +24,7 @@ public interface StatisticsMapper { " (SUM(recharge_coin) + SUM(free_coin) + SUM(task_coin)) AS totalSumCoin " + "FROM `detail_y` " + "WHERE update_type = '0' " + - " AND create_time >= '2024-01-01' " + + " AND create_time >= CONCAT(YEAR(CURDATE()), '-01-01') " + " AND create_time < NOW()") Statistics getTotalYearCoin(); //免费金币分类 @@ -45,7 +45,7 @@ public interface StatisticsMapper { @Select("SELECT COUNT(DISTINCT jwcode) AS rechargeCount " + "FROM `detail_y` " + "WHERE update_type = '0' " + - " AND create_time >= '2024-01-01' " + + " AND create_time >= CONCAT(YEAR(CURDATE()), '-01-01')" + " AND create_time < NOW()") int getYearRechargeCount(); diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 6239912..d101d16 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -133,7 +133,7 @@ public class AuditServiceImpl implements AuditService { detailY.setReson(reson); detailY.setFlag(flag); detailY.setCreateTime(createTime); - detailY.setConsumePlatform("金币客服充值"); + detailY.setConsumePlatform("金币系统"); diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java index 434d217..70fdc86 100644 --- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java @@ -119,7 +119,7 @@ public class OtherServiceImpl implements OtherService { // detailY.setUsername(username); // detailY.setArea(area); detailY.setProductName(productName); - detailY.setConsumePlatform("ERP充值"); + detailY.setConsumePlatform("ERP系统"); detailY.setRechargeWay(Way); @@ -135,7 +135,7 @@ public class OtherServiceImpl implements OtherService { // detailY.setUsername(username); // detailY.setArea(area); detailY.setProductName(productName); - detailY.setConsumePlatform("ERP充值"); + detailY.setConsumePlatform("ERP系统"); detailY.setConsumeType(Way); } else if (typesToUpdateTwo.contains(type)) { detailY.setUpdateType(2); // 设置 updateType 为 2 @@ -148,7 +148,7 @@ public class OtherServiceImpl implements OtherService { // detailY.setUsername(username); // detailY.setArea(area); detailY.setProductName(productName); - detailY.setConsumePlatform("ERP充值"); + detailY.setConsumePlatform("ERP系统"); detailY.setRefundType(Way); }else if (typesToUpdateThree.contains(type)) { detailY.setUpdateType(3); // 设置 updateType 为 3 @@ -161,7 +161,7 @@ public class OtherServiceImpl implements OtherService { // detailY.setUsername(username); // detailY.setArea(area); detailY.setProductName(productName); - detailY.setConsumePlatform("ERP充值"); + detailY.setConsumePlatform("ERP系统"); detailY.setReson(Way); } // 添加其他业务逻辑 diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index 60b2975..ab9060c 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -99,7 +99,7 @@ public class RechargeServiceImpl implements RechargeService { detail.setRemark(remark); detail.setUpdateType(0); detail.setAdminId(adminId); - detail.setConsumePlatform("金币客服充值"); + detail.setConsumePlatform("金币系统"); System.out.println(uuid+"/*/*/*-/-*/-/*-/-*/-/*-/*-/-*");