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

Skip to content

L
liquidnet-bus-v1
Commit be9de7a9 authored by GaoHu's avatar GaoHu
Browse files
Options

bug:exit

parent b3053a27
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 21 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java
View file @ be9de7a9
...@@ -468,29 +468,31 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -468,29 +468,31 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
} }
//不是特邀代理 //在原有的数据上新增加该用户下所有普代的提成 //不是特邀代理 //在原有的数据上新增加该用户下所有普代的提成
BigDecimal decimal = agentIdMasterMap.get(smileUser.getUid()); BigDecimal decimal = agentIdMasterMap.get(smileUser.getUid());
userData.setTotalCommission(new BigDecimal(decimal.stripTrailingZeros().toPlainString())); if (decimal!=null){
userData.setUid(smileUser.getUid()); userData.setTotalCommission(new BigDecimal(decimal.stripTrailingZeros().toPlainString()));
userData.setUsername(smileUser.getName()); userData.setUid(smileUser.getUid());
userData.setCityName(smileUser.getCity()); userData.setUsername(smileUser.getName());
userData.setType(smileUser.getType()); userData.setCityName(smileUser.getCity());
userData.setPhone(smileUser.getPhone()); userData.setType(smileUser.getType());
//判断用户是否为总代 userData.setPhone(smileUser.getPhone());
if (userData.getType() == 1) { //判断用户是否为总代
userData.setAgentName(smileUser.getName()); if (userData.getType() == 1) {
} else { userData.setAgentName(smileUser.getName());
if (!StringUtils.isEmpty(smileUser.getAgentId())) {
SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getAgentId());
userData.setAgentName(smileUserVO.getName());
} else { } 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);
} }
}); });
} }
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml
View file @ be9de7a9
...@@ -182,8 +182,9 @@ ...@@ -182,8 +182,9 @@
FROM smile_user AS su FROM smile_user AS su
INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master
FROM kylin_order_ticket_relations AS kotr 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} 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 GROUP BY su.uid
</select> </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