java/qijisheng.git

			@@ -13,6 +13,7 @@
			import com.ruoyi.order.model.OrderGood;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			@@ -50,6 +51,7 @@
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public void calculationCommission(Set<String> orderIds) {
			List<OrderGood> orderGoods = orderGoodService.list(new LambdaQueryWrapper<OrderGood>()
			.in(OrderGood::getOrderId, orderIds));
			@@ -63,6 +65,8 @@
			if (order.getIsCommission() == 1) {
			continue;
			}
			order.setIsCommission(1);
			orderService.updateById(order);
			R<Shop> r = shopClient.getShopById(order.getShopId());
			if (!R.isSuccess(r)) {
			throw new RuntimeException("获取门店信息失败");
			@@ -91,8 +95,8 @@
			for (OrderGood og : v) {// 累计分销金额

			// 直推上级分佣金额
			Integer superiorType = og.getSuperiorType();
			if (superiorType == 1 && inviteUser != null){
			String superiorType = og.getSuperiorType();
			if (superiorType.contains("1") && inviteUser != null){
			// 分佣金额
			BigDecimal superiorSubcommission = og.getSuperiorSubcommission();
			BigDecimal totalDistributionAmount = inviteUser.getTotalDistributionAmount();
			@@ -108,7 +112,7 @@
			appUserClient.editAppUserById(inviteUser);
			}else
			// 直帮上级分佣金额
			if (superiorType == 2 && superiorLeader != null){
			if (superiorType.contains("2") && superiorLeader != null){
			// 分佣金额
			BigDecimal superiorSubcommission = og.getSuperiorSubcommission();
			BigDecimal totalDistributionAmount = superiorLeader.getTotalDistributionAmount();