yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改统计数据

This commit is contained in:
yangjun 2024-07-12 16:04:04 +08:00
parent e58c618f13
commit 323bd015a6
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sqx/modules/artificer/entity/Orders.java
View File

@ -551,6 +551,12 @@ public class Orders implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Integer isCanSupplement; private Integer isCanSupplement;
@TableField(exist = false)
private String jzl;
@TableField(exist = false)
private String czl;
@TableField(exist = false)
private String zxsc;
public Orders() {} public Orders() {}
} }

11
src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
View File

@ -531,10 +531,16 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
for(Map<String,Object> map:pageList.getRecords()){ for(Map<String,Object> map:pageList.getRecords()){
Long artificerId = Long.parseLong(map.get("artificerId").toString()); Long artificerId = Long.parseLong(map.get("artificerId").toString());
//当期业绩 //当期业绩
BigDecimal currentPerformance = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); // 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); currentPerformance = currentPerformance.setScale(0,BigDecimal.ROUND_DOWN);
map.put("yj",String.valueOf(currentPerformance)); 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); String currentPeriodOrdersSum = ordersDao.selectOrdersArtificerIntegral(artificerId, endTime, startTime);
BigDecimal currentPeriodOrdersSumBig = new BigDecimal(currentPeriodOrdersSum); BigDecimal currentPeriodOrdersSumBig = new BigDecimal(currentPeriodOrdersSum);
@ -562,7 +568,8 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
map.put("czl",String.valueOf(divide1));//充值率 map.put("czl",String.valueOf(divide1));//充值率
//在线时长 //在线时长
String mint = ordersDao.selectOrdersZxscNum(artificerId,startTime,endTime); String mint = ordersDao.selectOrdersZxscNum(artificerId,startTime,endTime);
map.put("zxsc",String.valueOf(mint));//充值率 map.put("zxsc",String.valueOf(mint));//在线时长
map.put("ddsl",currentPeriodOrdersSum);//订单数量
} }

6
src/main/resources/mapper/artificer/OrdersDao.xml
View File

@ -821,9 +821,11 @@
left join orders_massage om on om.orders_id=o.orders_id 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 massage_type m on m.massage_type_id=om.massage_id
LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id
where o.artificer_id = #{artificerId} where o.old_orders_id is not null
and o.old_orders_id is not null
and o.status not in (4,11,15) and o.status not in (4,11,15)
<if test="artificerId!=null and artificerId!=''">
and o.artificer_id = #{artificerId}
</if>
<if test="startTime!=null and startTime!=''"> <if test="startTime!=null and startTime!=''">
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
</if> </if>