修改统计数据
This commit is contained in:
parent
e58c618f13
commit
323bd015a6
|
@ -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() {}
|
||||
}
|
||||
|
|
|
@ -531,10 +531,16 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
|
|||
for(Map<String,Object> 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<ArtificerDao, Artificer> 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);//订单数量
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
<if test="artificerId!=null and artificerId!=''">
|
||||
and o.artificer_id = #{artificerId}
|
||||
</if>
|
||||
<if test="startTime!=null and startTime!=''">
|
||||
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
|
||||
</if>
|
||||
|
|
Loading…
Reference in New Issue