From 323bd015a664a850fd63a12aebfe42071f37d6d2 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 12 Jul 2024 16:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/artificer/entity/Orders.java | 6 ++++++ .../service/impl/ArtificerServiceImpl.java | 13 ++++++++++--- src/main/resources/mapper/artificer/OrdersDao.xml | 6 ++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/entity/Orders.java b/src/main/java/com/sqx/modules/artificer/entity/Orders.java index 3b915cb..ca26311 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Orders.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Orders.java @@ -551,6 +551,12 @@ public class Orders implements Serializable { @TableField(exist = false) private Integer isCanSupplement; + @TableField(exist = false) + private String jzl; + @TableField(exist = false) + private String czl; + @TableField(exist = false) + private String zxsc; public Orders() {} } diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index a73b691..e44a6fe 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -531,10 +531,16 @@ public class ArtificerServiceImpl extends ServiceImpl i for(Map map:pageList.getRecords()){ Long artificerId = Long.parseLong(map.get("artificerId").toString()); //当期业绩 - BigDecimal currentPerformance = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); - currentPerformance = currentPerformance.setScale(0,BigDecimal.ROUND_DOWN); +// BigDecimal currentPerformance = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); + Integer dqyjOld = ordersDao.selectOrdersArtificerIntegralAchievement(artificerId, endTime, startTime); + BigDecimal currentPerformance = new BigDecimal(dqyjOld); + currentPerformance = currentPerformance.setScale(0,BigDecimal.ROUND_DOWN); map.put("yj",String.valueOf(currentPerformance)); + //首页 + BigDecimal earnings = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); + map.put("sy",String.valueOf(earnings)); + //当期订单数：计算订单发生了按摩行为的订单数，订单状态经历了开始服务到订单结束。 String currentPeriodOrdersSum = ordersDao.selectOrdersArtificerIntegral(artificerId, endTime, startTime); BigDecimal currentPeriodOrdersSumBig = new BigDecimal(currentPeriodOrdersSum); @@ -562,7 +568,8 @@ public class ArtificerServiceImpl extends ServiceImpl i map.put("czl",String.valueOf(divide1));//充值率 //在线时长 String mint = ordersDao.selectOrdersZxscNum(artificerId,startTime,endTime); - map.put("zxsc",String.valueOf(mint));//充值率 + map.put("zxsc",String.valueOf(mint));//在线时长 + map.put("ddsl",currentPeriodOrdersSum);//订单数量 } diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index e545a27..263a8d1 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -821,9 +821,11 @@ left join orders_massage om on om.orders_id=o.orders_id left join massage_type m on m.massage_type_id=om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id - where o.artificer_id = #{artificerId} - and o.old_orders_id is not null + where o.old_orders_id is not null and o.status not in (4,11,15) + + and o.artificer_id = #{artificerId} + and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}