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

Commit be9de7a9 authored by GaoHu's avatar GaoHu

bug:exit

parent b3053a27
......@@ -468,29 +468,31 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
}
//不是特邀代理 //在原有的数据上新增加该用户下所有普代的提成
BigDecimal decimal = agentIdMasterMap.get(smileUser.getUid());
userData.setTotalCommission(new BigDecimal(decimal.stripTrailingZeros().toPlainString()));
userData.setUid(smileUser.getUid());
userData.setUsername(smileUser.getName());
userData.setCityName(smileUser.getCity());
userData.setType(smileUser.getType());
userData.setPhone(smileUser.getPhone());
//判断用户是否为总代
if (userData.getType() == 1) {
userData.setAgentName(smileUser.getName());
} else {
if (!StringUtils.isEmpty(smileUser.getAgentId())) {
SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getAgentId());
userData.setAgentName(smileUserVO.getName());
if (decimal!=null){
userData.setTotalCommission(new BigDecimal(decimal.stripTrailingZeros().toPlainString()));
userData.setUid(smileUser.getUid());
userData.setUsername(smileUser.getName());
userData.setCityName(smileUser.getCity());
userData.setType(smileUser.getType());
userData.setPhone(smileUser.getPhone());
//判断用户是否为总代
if (userData.getType() == 1) {
userData.setAgentName(smileUser.getName());
} else {
userData.setAgentName(null);
if (!StringUtils.isEmpty(smileUser.getAgentId())) {
SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getAgentId());
userData.setAgentName(smileUserVO.getName());
} else {
userData.setAgentName(null);
}
}
userData.setDataAgentVos(userDataAgentVos);
//设置打款状态
userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, smileUser.getUid()));
//缓存用户redis记录 计算
smileRedisUtils.setUserDataByUid(userData, performancesId);
userDataList.add(userData);
}
userData.setDataAgentVos(userDataAgentVos);
//设置打款状态
userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, smileUser.getUid()));
//缓存用户redis记录 计算
smileRedisUtils.setUserDataByUid(userData, performancesId);
userDataList.add(userData);
}
});
}
......
......@@ -182,8 +182,9 @@
FROM smile_user AS su
INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master
FROM kylin_order_ticket_relations AS kotr
INNER JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
WHERE kotr.performance_id = #{performancesId}
AND kotr.agent_id != 0) kk ON su.uid = kk.agent_id_master
AND kotr.agent_id != 0 AND kots.status IN (1,6,3)) kk ON su.uid = kk.agent_id_master
GROUP BY su.uid
</select>
......
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