java/qijisheng.git

			@@ -1,31 +1,29 @@
			package com.ruoyi.order.service.impl;

			import cn.hutool.core.bean.BeanUtil;
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.ruoyi.account.api.feignClient.*;
			import com.ruoyi.account.api.feignClient.AppUserClient;
			import com.ruoyi.account.api.feignClient.AppUserGiveawayTemporaryClient;
			import com.ruoyi.account.api.feignClient.BalanceChangeRecordClient;
			import com.ruoyi.account.api.feignClient.UserPointClient;
			import com.ruoyi.account.api.model.*;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.order.model.Order;
			import com.ruoyi.order.model.OrderGood;
			import com.ruoyi.order.service.CommissionService;
			import com.ruoyi.order.service.OrderGoodService;
			import com.ruoyi.order.service.OrderService;
			import com.ruoyi.other.api.domain.*;
			import com.ruoyi.other.api.feignClient.*;
			import com.ruoyi.order.model.Order;
			import com.ruoyi.order.model.OrderGood;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.extern.slf4j.Slf4j;
			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;
			import java.math.BigInteger;
			import java.time.LocalDateTime;
			import java.time.ZoneId;
			import java.util.*;
			import java.util.Arrays;
			import java.util.List;
			import java.util.Set;
			import java.util.stream.Collectors;

			@Service
			@@ -64,7 +62,7 @@
			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getIsCommission, 2).isNotNull(Order::getAfterSaleTime)
			.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){
			if(collect.isEmpty()){
			return;
			}

			@@ -339,7 +337,7 @@
			balanceChangeRecordCopy.setChangeType(4);
			balanceChangeRecordCopy.setBeforeAmount(balance);
			balanceChangeRecordCopy.setChangeAmount(zdls_price);
			balanceChangeRecordCopy.setAfterAmount(superiorLeader.getBalance());
			balanceChangeRecordCopy.setAfterAmount(superiorLeader.getBalance().add(zdls_price));
			balanceChangeRecordCopy.setDelFlag(0);
			balanceChangeRecordCopy.setCreateTime(LocalDateTime.now());
			balanceChangeRecordClient.saveBalanceChangeRecordCopy(balanceChangeRecordCopy);
			@@ -350,7 +348,7 @@
			userPointCopy.setType(2);
			userPointCopy.setHistoricalPoint(lavePoint);
			userPointCopy.setVariablePoint(zdls_point);
			userPointCopy.setBalance(superiorLeader.getLavePoint());
			userPointCopy.setBalance(superiorLeader.getLavePoint() + zdls_point);
			userPointCopy.setCreateTime(LocalDateTime.now());
			userPointCopy.setAppUserId(superiorLeader.getId());
			userPointCopy.setObjectId(order.getId());
			@@ -444,7 +442,7 @@
			shopBalanceStatementCopy.setType(1);
			shopBalanceStatementCopy.setHistoricalBalance(shopBalance);
			shopBalanceStatementCopy.setVariableAmount(fws_price);
			shopBalanceStatementCopy.setBalance(shop1.getBalance());
			shopBalanceStatementCopy.setBalance(shop1.getBalance().add(fws_price));
			shopBalanceStatementCopy.setCreateTime(LocalDateTime.now());
			shopBalanceStatementCopy.setCreateUserId(order.getAppUserId());
			shopBalanceStatementCopy.setObjectId(order.getId());
			@@ -457,7 +455,7 @@
			userPointCopy.setType(9);
			userPointCopy.setHistoricalPoint(lavePoint);
			userPointCopy.setVariablePoint(fws_point);
			userPointCopy.setBalance(bdShopAppUser.getLavePoint());
			userPointCopy.setBalance(bdShopAppUser.getLavePoint() + fws_point);
			userPointCopy.setCreateTime(LocalDateTime.now());
			userPointCopy.setAppUserId(bdShopAppUser.getId());
			userPointCopy.setObjectId(order.getId());
			@@ -467,13 +465,13 @@
			// appUserClient.vipUpgrade(bdShopAppUser.getId());
			}

			if(shopLavePoint > 0){
			if(fws_point > 0){
			ShopPointCopy shopPointCopy = new ShopPointCopy();
			shopPointCopy.setShopId(shop1.getId());
			shopPointCopy.setType(2);
			shopPointCopy.setHistoricalPoint(shopLavePoint);
			shopPointCopy.setVariablePoint(fws_point);
			shopPointCopy.setBalance(shop1.getLavePoint());
			shopPointCopy.setBalance(shop1.getLavePoint() + fws_point);
			shopPointCopy.setCreateTime(LocalDateTime.now());
			shopPointCopy.setCreateUserId(order.getAppUserId());
			shopPointCopy.setObjectId(order.getId());
			@@ -570,7 +568,7 @@
			shopBalanceStatementCopy.setType(2);
			shopBalanceStatementCopy.setHistoricalBalance(shopBalance);
			shopBalanceStatementCopy.setVariableAmount(gjfws_price);
			shopBalanceStatementCopy.setBalance(shop2.getBalance());
			shopBalanceStatementCopy.setBalance(shop2.getBalance().add(gjfws_price));
			shopBalanceStatementCopy.setCreateTime(LocalDateTime.now());
			shopBalanceStatementCopy.setCreateUserId(order.getAppUserId());
			shopBalanceStatementCopy.setObjectId(order.getId());
			@@ -583,7 +581,7 @@
			userPointCopy.setType(14);
			userPointCopy.setHistoricalPoint(lavePoint);
			userPointCopy.setVariablePoint(gjfws_point);
			userPointCopy.setBalance(sjShopAppUser.getLavePoint());
			userPointCopy.setBalance(sjShopAppUser.getLavePoint() + gjfws_point);
			userPointCopy.setCreateTime(LocalDateTime.now());
			userPointCopy.setAppUserId(sjShopAppUser.getId());
			userPointCopy.setObjectId(order.getId());
			@@ -599,7 +597,7 @@
			shopPointCopy.setType(3);
			shopPointCopy.setHistoricalPoint(shopLavePoint);
			shopPointCopy.setVariablePoint(gjfws_point);
			shopPointCopy.setBalance(shop2.getLavePoint());
			shopPointCopy.setBalance(shop2.getLavePoint() + gjfws_point);
			shopPointCopy.setCreateTime(LocalDateTime.now());
			shopPointCopy.setCreateUserId(order.getAppUserId());
			shopPointCopy.setObjectId(order.getId());
			@@ -727,7 +725,7 @@
			shopBalanceStatementCopy.setType(3);
			shopBalanceStatementCopy.setHistoricalBalance(shopBalance);
			shopBalanceStatementCopy.setVariableAmount(hxmd_price);
			shopBalanceStatementCopy.setBalance(shop.getBalance());
			shopBalanceStatementCopy.setBalance(shop.getBalance().add(hxmd_price));
			shopBalanceStatementCopy.setCreateTime(LocalDateTime.now());
			shopBalanceStatementCopy.setCreateUserId(order.getAppUserId());
			shopBalanceStatementCopy.setObjectId(order.getId());
			@@ -740,7 +738,7 @@
			userPointCopy.setType(8);
			userPointCopy.setHistoricalPoint(lavePoint);
			userPointCopy.setVariablePoint(hxmd_point);
			userPointCopy.setBalance(shopAppUser.getLavePoint());
			userPointCopy.setBalance(shopAppUser.getLavePoint() + hxmd_point);
			userPointCopy.setCreateTime(LocalDateTime.now());
			userPointCopy.setAppUserId(shopAppUser.getId());
			userPointCopy.setObjectId(order.getId());
			@@ -756,7 +754,7 @@
			shopPointCopy.setType(1);
			shopPointCopy.setHistoricalPoint(shopLavePoint);
			shopPointCopy.setVariablePoint(hxmd_point);
			shopPointCopy.setBalance(shop.getLavePoint());
			shopPointCopy.setBalance(shop.getLavePoint() + hxmd_point);
			shopPointCopy.setCreateTime(LocalDateTime.now());
			shopPointCopy.setCreateUserId(order.getAppUserId());
			shopPointCopy.setObjectId(order.getId());
			@@ -813,7 +811,7 @@
			userPointCopy.setType(10);
			userPointCopy.setHistoricalPoint(lavePoint);
			userPointCopy.setVariablePoint(js_point);
			userPointCopy.setBalance(technicianAppUser.getLavePoint());
			userPointCopy.setBalance(technicianAppUser.getLavePoint() + js_point);
			userPointCopy.setCreateTime(LocalDateTime.now());
			userPointCopy.setAppUserId(technicianAppUser.getId());
			userPointCopy.setObjectId(order.getId());