ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
@@ -162,6 +162,7 @@ Long userId = SecurityUtils.getUserId(); TUserLotteryEventQuestions questionsServiceOne = userLotteryEventQuestionsService.getOne(new QueryWrapper<TUserLotteryEventQuestions>().eq("lottery_event_id", dto.getId()).eq("user_id", userId)); LotteryEventQuestionsVo vo = new LotteryEventQuestionsVo(); vo.setId(dto.getId()); int count = lotteryEventServiceQuestionsService.count(new QueryWrapper<TLotteryEventQuestions>().eq("lottery_event_id", dto.getId())); vo.setTotal(count); //没有答题，直接从第一题开始 @@ -190,7 +191,6 @@ } current--; } else { current++; //下一题 current++; if (current >= count) { @@ -273,6 +273,9 @@ public R<Boolean> endAnswerQuestion(@PathVariable("id") String id) { Long userId = SecurityUtils.getUserId(); TLotteryEvent lotteryEvent = lotteryEventService.getById(id); if(null == lotteryEvent){ return R.fail("无效的抽奖活动id"); } TUserLotteryEventQuestions questionsServiceOne = userLotteryEventQuestionsService.getOne(new QueryWrapper<TUserLotteryEventQuestions>().eq("lottery_event_id", id).eq("user_id", userId)); if (null == questionsServiceOne) { questionsServiceOne = new TUserLotteryEventQuestions(); @@ -285,9 +288,8 @@ questionsServiceOne.setStatus(2); questionsServiceOne.setEndTime(LocalDateTime.now()); //计算正确率 List<TUserLotteryEventQuestionsAnswers> list = userLotteryEventQuestionsAnswersService.list(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_id", id).eq("user_id", userId)); int count = list.size(); int right = list.stream().filter(item -> 1 == item.getIsCorrect()).collect(Collectors.toList()).size(); int count = lotteryEventQuestionsAnswersService.count(new QueryWrapper<TLotteryEventQuestionsAnswers>().eq("lottery_event_id", id)); int right = userLotteryEventQuestionsAnswersService.count(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_id", id).eq("user_id", userId).eq("is_correct", 1)); BigDecimal multiply = new BigDecimal(right).divide(new BigDecimal(count), 4, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)); questionsServiceOne.setCorrectAnswerRate(multiply); userLotteryEventQuestionsService.saveOrUpdate(questionsServiceOne); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1892,6 +1892,12 @@ merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO); } } if(null == merVerifyOrderVo.getRealReceiveMoney()){ merVerifyOrderVo.setRealReceiveMoney(BigDecimal.ZERO); } if(null == merVerifyOrderVo.getReceiveMoney()){ merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO); } merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(merVerifyOrderVo.getReceiveMoney())); merVerifyOrderVo.setUserId(order.getUserId()); merVerifyOrderVo.setUserName(member.getRealName()); @@ -1998,9 +2004,9 @@ } Member member = remoteMemberService.getMember(order.getUserId()).getData(); //获取核销商户 ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData(); Long shopId = shopRelUserVo.getShopId(); log.info("当前核销员工【" + shopRelUserVo.getUserName() + "】门店ID：" + shopId); // ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData(); Long shopId = member.getRelationShopId(); // log.info("当前核销员工【" + shopRelUserVo.getUserName() + "】门店ID：" + shopId); //获取订单商品列表 List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId); //绑定用户判断核销商户 @@ -2066,6 +2072,7 @@ ConsumerGoods consumerGoods; String consumerGoodsId; Goods goods; if(null != appUserOrderGoodsPageVoList.get(0).getGoodsId()){ //循环生成商品服务 List<ConsumerGoods> consumerGoodsList = new ArrayList<>(); for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) { @@ -2125,6 +2132,7 @@ } } consumerGoodsService.saveBatchConsumerGoods(consumerGoodsList); } //生成返回 MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo(); merVerifyOrderVo.setOrderId(orderId); @@ -2177,6 +2185,7 @@ order.setNewMemberFlag(0); } this.saveOrUpdate(order); if(4 != order.getOrderFrom()){ // 订单金额大于0时进行分账 OrderPayment orderPayment = orderPaymentService.getOne(new QueryWrapper<OrderPayment>() .eq("order_id", order.getOrderId()).eq("pay_status", 2) @@ -2197,6 +2206,7 @@ payRecord.setPayType(merVerifyOrderDto.getPayType()); payRecordService.save(payRecord); } } //更新用户积分和消费统计 MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto(); memberTotalChangeDto.setUserId(order.getUserId());
