记得上下班打卡 | git大法好,push需谨慎

Commit 09bae4b3 authored by GaoHu's avatar GaoHu

bug:代理总人数过滤

parent 366b33d8
...@@ -461,19 +461,20 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -461,19 +461,20 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
if (orgMap != null) { if (orgMap != null) {
userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP)); userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP));
} }
userData.setUid(smileUser.getUid());
userData.setUsername(smileUser.getName());
userData.setCityName(smileUser.getCity());
userData.setType(smileUser.getType());
userData.setDataAgentVos(userDataAgentVos);
//设置打款状态
userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, smileUser.getUid()));
ids.add(userData.getUid());
//缓存用户redis记录 计算
smileRedisUtils.setUserDataByUid(userData, performancesId);
if (!userDataAgentVo.getCommission().equals(new BigDecimal("0.00"))){
userDataList.add(userData);
}
} }
userData.setUid(smileUser.getUid());
userData.setUsername(smileUser.getName());
userData.setCityName(smileUser.getCity());
userData.setType(smileUser.getType());
userData.setDataAgentVos(userDataAgentVos);
//设置打款状态
userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, smileUser.getUid()));
ids.add(userData.getUid());
userDataList.add(userData);
//缓存用户redis记录 计算
smileRedisUtils.setUserDataByUid(userData, performancesId);
} }
}); });
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
FROM kylin_order_ticket_relations as kotr FROM kylin_order_ticket_relations as kotr
LEFT JOIN kylin_order_ticket_status AS kots ON kotr.order_id = kots.order_id LEFT JOIN kylin_order_ticket_status AS kots ON kotr.order_id = kots.order_id
INNER JOIN smile_user AS su ON su.uid = kotr.agent_id INNER JOIN smile_user AS su ON su.uid = kotr.agent_id
WHERE kots.status IN (1,6) WHERE kots.status IN (1,6,3)
AND kotr.agent_id != 0 AND kotr.agent_id != 0
AND kotr.performance_id = #{performancesId} AND kotr.performance_id = #{performancesId}
group by kotr.agent_id) kk; group by kotr.agent_id) kk;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment