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

Commit f547a5dd authored by GaoHu's avatar GaoHu

bug:用户总营收计算错误问题,打款后数据读取修改

parent 7ea3cf66
...@@ -156,12 +156,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -156,12 +156,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
@Override @Override
public AjaxResult price(SmilePriceParam smilePriceParam) { public AjaxResult price(SmilePriceParam smilePriceParam) {
//查询演出状态 //查询演出状态
AjaxResult showStatue = showStatue(smilePriceParam); /*AjaxResult showStatue = showStatue(smilePriceParam);
if (showStatue != null) { if (showStatue != null) {
return showStatue; return showStatue;
} }*/
//该uid本次打款金额
BigDecimal priceByUid = new BigDecimal("0");
//用户是否打款 //用户是否打款
Integer status = smileRedisUtils.getShowPriceUid(smilePriceParam.getPerformancesId(), smilePriceParam.getUid()); Integer status = smileRedisUtils.getShowPriceUid(smilePriceParam.getPerformancesId(), smilePriceParam.getUid());
if (status != null) { if (status != null) {
...@@ -202,9 +200,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -202,9 +200,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
smilePriceByUidAndPerId.setPerformancesId(smilePriceParam.getPerformancesId()); smilePriceByUidAndPerId.setPerformancesId(smilePriceParam.getPerformancesId());
smilePriceByUidAndPerId.setUid(smileUser.getUid()); smilePriceByUidAndPerId.setUid(smileUser.getUid());
smilePriceByUidAndPerId.setPrice(price); smilePriceByUidAndPerId.setPrice(price);
if (smileUser.getUid().equals(smilePriceParam.getUid())) {
priceByUid = price;
}
smilePriceByUidAndPerId.setCreatedDate(LocalDateTime.now()); smilePriceByUidAndPerId.setCreatedDate(LocalDateTime.now());
String userDataJson = JSON.toJSONString(userDataByUid); String userDataJson = JSON.toJSONString(userDataByUid);
...@@ -223,12 +218,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -223,12 +218,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
smilePriceUpdate.setStatus(1); smilePriceUpdate.setStatus(1);
smilePriceUpdate.setUpdatedDate(LocalDateTime.now()); smilePriceUpdate.setUpdatedDate(LocalDateTime.now());
smilePriceMapper.update(smilePriceUpdate, lambdaQueryWrapper); smilePriceMapper.update(smilePriceUpdate, lambdaQueryWrapper);
SmilePrice smilePrice = smilePriceMapper.selectOne(lambdaQueryWrapper);
//该用户该演出标记打款 //该用户该演出标记打款
smileRedisUtils.setPriceByUid(smilePriceParam.getPerformancesId(), smilePriceParam.getUid()); smileRedisUtils.setPriceByUid(smilePriceParam.getPerformancesId(), smilePriceParam.getUid());
//计算总营收 //计算总营收
BigDecimal userTotalPrice = smileRedisUtils.getUserTotalPrice(smilePriceParam.getUid()); BigDecimal userTotalPrice = smileRedisUtils.getUserTotalPrice(smilePriceParam.getUid());
smileRedisUtils.setUserTotalPrice(smilePriceParam.getUid(), priceByUid.add(userTotalPrice)); smileRedisUtils.setUserTotalPrice(smilePriceParam.getUid(), smilePrice.getPrice().add(userTotalPrice));
} }
return AjaxResult.success(); return AjaxResult.success();
} }
...@@ -361,10 +356,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -361,10 +356,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
showAgentVoList.add(showAgentVo); showAgentVoList.add(showAgentVo);
} }
//根据演出id查询出所有代理人的销售
List<ShowBaseVoDto> showBaseVoList = smileAgentMapper.selectMapByPerId(performancesId);
//根据代理id进行分组
Map<String, List<ShowBaseVoDto>> stringListMap = showBaseVoList.stream().collect(Collectors.groupingBy(ShowBaseVoDto::getAgentId));
List<String> ids = ObjectUtil.cloneLinkedListStr(); List<String> ids = ObjectUtil.cloneLinkedListStr();
//创建list长度定位分组数量 //创建list长度定位分组数量
List<UserData> userDataList = new ArrayList<>(); List<UserData> userDataList = new ArrayList<>();
...@@ -377,12 +368,21 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -377,12 +368,21 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
for (SmilePrice smilePrice : smilePrices) { for (SmilePrice smilePrice : smilePrices) {
if (smilePrice.getRecord() != null && !smilePrice.getRecord().equals("")) { if (smilePrice.getRecord() != null && !smilePrice.getRecord().equals("")) {
UserData userData = JSON.parseObject(smilePrice.getRecord(), UserData.class); UserData userData = JSON.parseObject(smilePrice.getRecord(), UserData.class);
//保存打款标识
userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, userData.getUid())); userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, userData.getUid()));
userDataList.add(userData); userDataList.add(userData);
ids.add(userData.getUid()); ids.add(userData.getUid());
} }
} }
//判断该演出是否有打款
Integer showPriceId = smileRedisUtils.getShowPriceId(performancesId);
if (showPriceId==null){
//根据演出id查询出所有代理人的销售
List<ShowBaseVoDto> showBaseVoList = smileAgentMapper.selectMapByPerId(performancesId);
//根据代理id进行分组
Map<String, List<ShowBaseVoDto>> stringListMap = showBaseVoList.stream().collect(Collectors.groupingBy(ShowBaseVoDto::getAgentId));
//遍历分组 //遍历分组
for (Map.Entry<String, List<ShowBaseVoDto>> showMap : stringListMap.entrySet()) { for (Map.Entry<String, List<ShowBaseVoDto>> showMap : stringListMap.entrySet()) {
UserData userData = UserData.getNew(); UserData userData = UserData.getNew();
...@@ -476,6 +476,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -476,6 +476,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
smileRedisUtils.setUserDataByUid(userData, performancesId); smileRedisUtils.setUserDataByUid(userData, performancesId);
} }
}); });
}
saleDataVo.setUserDataList(userDataList); saleDataVo.setUserDataList(userDataList);
saleDataVo.setShowAgentVoList(showAgentVoList); saleDataVo.setShowAgentVoList(showAgentVoList);
return saleDataVo; return saleDataVo;
......
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