From b58888afe2d964969c8a1c68ba6f4a5ba5d99bdd Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Sun, 12 Oct 2025 16:20:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=AE=9E=E7=89=A9=E8=AE=A2=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/controller/StatisticsController.java | 2 ++ src/main/resources/mapper/book/BuyOrderDao.xml | 12 ++++++------ .../resources/mapper/book/TransactionDetailsDao.xml | 4 ++-- .../resources/mapper/master/UserCourseBuyDao.xml | 4 ++-- src/main/resources/mapper/master/UserVipLogDao.xml | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/peanut/modules/master/controller/StatisticsController.java b/src/main/java/com/peanut/modules/master/controller/StatisticsController.java index dd49f48c..c9384a1d 100644 --- a/src/main/java/com/peanut/modules/master/controller/StatisticsController.java +++ b/src/main/java/com/peanut/modules/master/controller/StatisticsController.java @@ -222,6 +222,7 @@ public class StatisticsController { titleRow.createCell(7).setCellValue("订单金额"); titleRow.createCell(8).setCellValue("实物金额"); titleRow.createCell(9).setCellValue("商品名称"); + titleRow.createCell(10).setCellValue("备注"); //序号，默认为1 int cell = 1; //遍历 @@ -237,6 +238,7 @@ public class StatisticsController { row.createCell(7).setCellValue(map.get("orderPrice").toString()); row.createCell(8).setCellValue(map.get("price").toString()); row.createCell(9).setCellValue(map.get("productName").toString()); + row.createCell(10).setCellValue(map.get("remark").toString()); //序号自增 cell++; } diff --git a/src/main/resources/mapper/book/BuyOrderDao.xml b/src/main/resources/mapper/book/BuyOrderDao.xml index 8c186bb5..d463d0ff 100644 --- a/src/main/resources/mapper/book/BuyOrderDao.xml +++ b/src/main/resources/mapper/book/BuyOrderDao.xml @@ -56,11 +56,11 @@ from ( select t.createTime,t.name,t.tel,t.orderSn,t.orderStatus,t.payType,t.orderPrice, t.orderPrice-(select IF(SUM(sp2.price) is NULL,0,SUM(sp2.price)) from shop_product sp2 where sp2.goods_type = '05' and sp2.product_id in (GROUP_CONCAT(sp.product_id SEPARATOR ','))) price, - GROUP_CONCAT(sp.product_name SEPARATOR ', ') productName + GROUP_CONCAT(sp.product_name SEPARATOR ', ') productName,t.remark from ( select bo.order_id,DATE_FORMAT(bo.create_time,'%Y-%m-%d %H:%i:%s') createTime,u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel,bo.order_sn orderSn, IF(bo.payment_method=1,'微信',IF(bo.payment_method=2,'支付宝',IF(bo.payment_method=4,'天医币','0'))) payType, - IF(bo.order_status = 4,'已删除',IF(bo.order_status = 3,'已完成',IF(bo.order_status = 2,'已发货','已付款'))) orderStatus,bo.real_money orderPrice + IF(bo.order_status = 4,'已删除',IF(bo.order_status = 3,'已完成',IF(bo.order_status = 2,'已发货','已付款'))) orderStatus,bo.real_money orderPrice,if(bo.remark like '%退%',bo.remark,'') remark from buy_order bo left join user u on u.id = bo.user_id left join buy_order_product bop on bop.order_id = bo.order_id @@ -74,7 +74,7 @@ left join shop_product sp on sp.product_id = bop.product_id group by t.orderSn ) q - left join pay_zfb_order pzo on pzo.relevanceOid = q.orderSn + left join pay_zfb_order pzo on pzo.relevanceOid = q.orderSn and pzo.trade_no is not null ) s group by payType @@ -84,11 +84,11 @@ from ( select t.createTime,t.name,t.tel,t.orderSn,t.orderStatus,t.payType,t.orderPrice, t.orderPrice-(select IF(SUM(sp2.price) is NULL,0,SUM(sp2.price)) from shop_product sp2 where sp2.goods_type = '05' and sp2.product_id in (GROUP_CONCAT(sp.product_id SEPARATOR ','))) price, - GROUP_CONCAT(sp.product_name SEPARATOR ', ') productName + GROUP_CONCAT(sp.product_name SEPARATOR ', ') productName,t.remark from ( select bo.order_id,DATE_FORMAT(bo.create_time,'%Y-%m-%d %H:%i:%s') createTime,u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel,bo.order_sn orderSn, IF(bo.payment_method=1,'微信',IF(bo.payment_method=2,'支付宝',IF(bo.payment_method=4,'天医币','0'))) payType, - IF(bo.order_status = 4,'已删除',IF(bo.order_status = 3,'已完成',IF(bo.order_status = 2,'已发货','已付款'))) orderStatus,bo.real_money orderPrice + IF(bo.order_status = 4,'已删除',IF(bo.order_status = 3,'已完成',IF(bo.order_status = 2,'已发货','已付款'))) orderStatus,bo.real_money orderPrice,if(bo.remark like '%退%',bo.remark,'') remark from buy_order bo left join user u on u.id = bo.user_id left join buy_order_product bop on bop.order_id = bo.order_id @@ -102,7 +102,7 @@ left join shop_product sp on sp.product_id = bop.product_id group by t.orderSn ) q - left join pay_zfb_order pzo on pzo.relevanceOid = q.orderSn + left join pay_zfb_order pzo on pzo.relevanceOid = q.orderSn and pzo.trade_no is not null diff --git a/src/main/resources/mapper/book/TransactionDetailsDao.xml b/src/main/resources/mapper/book/TransactionDetailsDao.xml index c35964d3..bcc559cc 100644 --- a/src/main/resources/mapper/book/TransactionDetailsDao.xml +++ b/src/main/resources/mapper/book/TransactionDetailsDao.xml @@ -48,7 +48,7 @@ group by t.id order by t.createTime ) q - left join pay_zfb_order pzo on pzo.relevanceOid = q.payNo + left join pay_zfb_order pzo on pzo.relevanceOid = q.payNo and pzo.trade_no is not null ) s group by type,payMethod,goodsType @@ -74,7 +74,7 @@ group by t.id order by t.createTime ) q - left join pay_zfb_order pzo on pzo.relevanceOid = q.payNo + left join pay_zfb_order pzo on pzo.relevanceOid = q.payNo and pzo.trade_no is not null \ No newline at end of file diff --git a/src/main/resources/mapper/master/UserCourseBuyDao.xml b/src/main/resources/mapper/master/UserCourseBuyDao.xml index c7343b39..44691d47 100644 --- a/src/main/resources/mapper/master/UserCourseBuyDao.xml +++ b/src/main/resources/mapper/master/UserCourseBuyDao.xml @@ -30,7 +30,7 @@ left join user u on u.id = ucb.user_id left join course c on c.id = ucb.course_id left join course_catalogue cc on cc.id = ucb.catalogue_id - left join pay_zfb_order pzo on pzo.relevanceOid = ucbl.order_sn + left join pay_zfb_order pzo on pzo.relevanceOid = ucbl.order_sn and pzo.trade_no is not null where ucbl.del_flag = 0 and DATE_FORMAT(ucbl.pay_time,'%Y-%m-%d') <= #{date} order by ucb.id ) t) s) q) w @@ -65,7 +65,7 @@ left join user u on u.id = ucb.user_id left join course c on c.id = ucb.course_id left join course_catalogue cc on cc.id = ucb.catalogue_id - left join pay_zfb_order pzo on pzo.relevanceOid = ucbl.order_sn + left join pay_zfb_order pzo on pzo.relevanceOid = ucbl.order_sn and pzo.trade_no is not null where ucbl.del_flag = 0 and DATE_FORMAT(ucbl.pay_time,'%Y-%m-%d') <= #{date} order by ucb.id ) t) s) q) w diff --git a/src/main/resources/mapper/master/UserVipLogDao.xml b/src/main/resources/mapper/master/UserVipLogDao.xml index cb73284e..05290aef 100644 --- a/src/main/resources/mapper/master/UserVipLogDao.xml +++ b/src/main/resources/mapper/master/UserVipLogDao.xml @@ -17,7 +17,7 @@ from user_vip_log uvl left join user_vip uv on uv.id = uvl.user_vip_id left join user u on u.id = uvl.user_id - left join pay_zfb_order pzo on pzo.relevanceOid = uvl.order_sn + left join pay_zfb_order pzo on pzo.relevanceOid = uvl.order_sn and pzo.trade_no is not null where u.del_flag = 0 and uvl.del_flag = 0 and uv.del_flag = 0 and DATE_FORMAT(IF(uvl.pay_time is NULL,uvl.start_time,uvl.pay_time), '%Y-%m') <= SUBSTR(#{date},1,7) and u.id not in (select id from user where tel in ('18812616272','13110039505','18526084267','12222222222','13333333333','14444444444','15555555555','16666666666','17777777777','18888888888','1774455','15533','165965','164964','54321','111','13662001490','15505153873','18834844847','17602219785','19999999999','12299','166933','16855','17602634511','16161616161','17171717171','112112112','21212121211','222222','666666','123123','789789','96','25252525','3434343434','123789','124789','789789','163963','5656','19966','1664455','15151515151','256366','986986','18834844846','18834844849','15611027864','18047689535','18834844848','456456456')) @@ -42,7 +42,7 @@ from user_vip_log uvl left join user_vip uv on uv.id = uvl.user_vip_id left join user u on u.id = uvl.user_id - left join pay_zfb_order pzo on pzo.relevanceOid = uvl.order_sn + left join pay_zfb_order pzo on pzo.relevanceOid = uvl.order_sn and pzo.trade_no is not null where u.del_flag = 0 and uvl.del_flag = 0 and uv.del_flag = 0 and DATE_FORMAT(IF(uvl.pay_time is NULL,uvl.start_time,uvl.pay_time), '%Y-%m') <= SUBSTR(#{date},1,7) and u.id not in (select id from user where tel in ('18812616272','13110039505','18526084267','12222222222','13333333333','14444444444','15555555555','16666666666','17777777777','18888888888','1774455','15533','165965','164964','54321','111','13662001490','15505153873','18834844847','17602219785','19999999999','12299','166933','16855','17602634511','16161616161','17171717171','112112112','21212121211','222222','666666','123123','789789','96','25252525','3434343434','123789','124789','789789','163963','5656','19966','1664455','15151515151','256366','986986','18834844846','18834844849','15611027864','18047689535','18834844848','456456456')) order by uvl.end_time asc ) t order by currentDays desc