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

Commit cf5a7c5a authored by GaoHu's avatar GaoHu

exit

parent 9ec9f663
...@@ -178,22 +178,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -178,22 +178,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
BigDecimal userTotalPrice = smileRedisUtils.getUserTotalPrice(smilePriceParam.getUid()); BigDecimal userTotalPrice = smileRedisUtils.getUserTotalPrice(smilePriceParam.getUid());
smileRedisUtils.setUserTotalPrice(smilePriceParam.getUid(), price.add(userTotalPrice)); smileRedisUtils.setUserTotalPrice(smilePriceParam.getUid(), price.add(userTotalPrice));
} }
/*else {
LambdaQueryWrapper<SmilePrice> queryWrapper = Wrappers.lambdaQuery(SmilePrice.class);
queryWrapper.eq(SmilePrice::getPerformancesId, smilePriceParam.getPerformancesId());
queryWrapper.eq(SmilePrice::getUid, smilePriceParam.getUid());
queryWrapper.eq(SmilePrice::getDelTag,0);
queryWrapper.eq(SmilePrice::getUpdatedDate,"");
SmilePrice smilePrice1 = smilePriceMapper.selectOne(queryWrapper);
BigDecimal userTotalPrice = smileRedisUtils.getUserTotalPrice(smilePriceParam.getUid());
smileRedisUtils.setUserTotalPrice(smilePriceParam.getUid(),userTotalPrice.subtract(smilePrice1.getPrice()));
//删除打款信息
smileRedisUtils.delPriceByUid(smilePriceParam.getPerformancesId(), smilePriceParam.getUid());
//更新打款表
smilePrice.setUpdatedDate(LocalDateTime.now());
smilePrice.setDelTag(1);
smilePriceMapper.updateById(smilePrice);
}*/
return AjaxResult.success(); return AjaxResult.success();
} }
...@@ -349,7 +333,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -349,7 +333,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
UserData userData = new UserData(); UserData userData = new UserData();
//个人用户的演出数据详情 //个人用户的演出数据详情
//便利票种id 查询用户的销售数据信息 //便利票种id 查询用户的销售数据信息
List<UserDataAgentVo> userDataAgentVos = new ArrayList<UserDataAgentVo>(); List<UserDataAgentVo> userDataAgentVos = new ArrayList<>();
for (TicketAndStatusDao smileAgent : smileAgentList) { for (TicketAndStatusDao smileAgent : smileAgentList) {
UserDataAgentVo userDataAgentVo = new UserDataAgentVo(); UserDataAgentVo userDataAgentVo = new UserDataAgentVo();
Map userMap = smileAgentMapper.getUserDataByPerIdAndTicketsId(performancesId, smileUser.getUid(), smileAgent.getTicketsId()); Map userMap = smileAgentMapper.getUserDataByPerIdAndTicketsId(performancesId, smileUser.getUid(), smileAgent.getTicketsId());
...@@ -383,23 +367,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -383,23 +367,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
userDataAgentVos.add(userDataAgentVo); userDataAgentVos.add(userDataAgentVo);
} }
} }
/*//票务类型
userData.setTicketName(a1.get("title") == null ? "" : a1.get("title").toString());
//数量
userData.setTicketNumber(a1.get("number") == null ? 0 : Integer.parseInt(a1.get("number").toString()));
//总金额
userData.setSellPrice(new BigDecimal(a1.get("price") == null ? "0" : a1.get("price").toString()));
//票提
userData.setPiaoTi(new BigDecimal(a1.get("paioTi") == null ? "" : a1.get("paioTi").toString()));
//佣金
userData.setCommission(new BigDecimal(a1.get("commiss") == null ? "0" : a1.get("commiss").toString()));
userData.setTicketId(a1.get("ticketId") == null ? "" : a1.get("ticketId").toString());
SmileSellDataVO smileSellDataVO = smileRedisUtils.getSellDataVO(smileUser.getUid(), performancesId);
BeanUtils.copyProperties(smileSellDataVO, userData);*/
userData.setUid(smileUser.getUid()); userData.setUid(smileUser.getUid());
userData.setUsername(smileUser.getName()); userData.setUsername(smileUser.getName());
userData.setCityName(smileUser.getCity()); userData.setCityName(smileUser.getCity());
......
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