java/qijisheng.git

			@@ -58,16 +58,13 @@
			@Transactional(rollbackFor = Exception.class)
			public void calculationCommission() {
			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getIsCommission, 0).isNotNull(Order::getAfterSaleTime)
			.eq(Order::getDelFlag, 0).last(" and after_sale_time <= now()"));
			.eq(Order::getDelFlag, 0).ne(Order::getPayMethod, 3).last(" and after_sale_time <= now()"));
			List<Long> collect = list.stream().map(Order::getId).collect(Collectors.toList());
			if(collect.size() == 0){
			return;
			}

			for (Order order : list) {
			if(order.getPayMethod() == 3){
			continue;
			}
			List<OrderGood> orderGoods = orderGoodService.list(new LambdaQueryWrapper<OrderGood>()
			.eq(OrderGood::getOrderId, order.getId()));
			AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
			@@ -143,6 +140,7 @@
			bdmdsj_point += orderGood.getBoundShopSuperiorsPoints();
			}
			//直推上级
			if(null != appUser.getInviteUserId()){
			AppUser inviteUser = appUserClient.getAppUserById(appUser.getInviteUserId());
			if(null != inviteUser){
			BigDecimal balance = inviteUser.getBalance();
			@@ -198,6 +196,8 @@
			appUserClient.vipUpgrade(inviteUser.getId());
			}
			}
			}

			//直帮上级
			AppUser superiorLeader = appUserClient.getSuperiorLeader(appUser.getId()).getData();
			if(null != superiorLeader){
			@@ -461,6 +461,7 @@
			}

			//上级门店分佣
			if(null != shop1){
			Integer pid = shop1.getPid();
			Shop shop2 = shopClient.getShopById(pid).getData();
			if(null != shop2){
			@@ -543,11 +544,10 @@
			}
			}
			}
			}

			order.setIsCommission(1);
			orderService.updateById(order);
			}



			}
			}