java/qijisheng.git

			@@ -8,6 +8,7 @@
			import com.ruoyi.account.api.model.BalanceChangeRecord;
			import com.ruoyi.account.api.model.UserPoint;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.order.service.CommissionService;
			import com.ruoyi.order.service.OrderGoodService;
			import com.ruoyi.order.service.OrderService;
			@@ -97,6 +98,7 @@
			BigDecimal superiorSubcommission = orderGood.getSuperiorSubcommission();
			//上级获得分佣积分（直推上级\|直帮上级）
			Integer superiorRebatePoints = orderGood.getSuperiorRebatePoints();
			if(StringUtils.isNotEmpty(orderGood.getSuperiorPriceType())){
			String[] split = orderGood.getSuperiorPriceType().split(",");
			for (String s : split) {
			//直推上级
			@@ -108,7 +110,9 @@
			zbsj_price = zbsj_price.add(superiorSubcommission);
			}
			}
			split = orderGood.getSuperiorType().split(",");
			}
			if(StringUtils.isNotEmpty(orderGood.getSuperiorType())){
			String[] split = orderGood.getSuperiorType().split(",");
			for (String s : split) {
			//直推上级
			if("1".equals(s)){
			@@ -117,6 +121,7 @@
			//直帮上级
			if("2".equals(s)){
			zbsj_point += superiorRebatePoints;
			}
			}
			}

			@@ -252,7 +257,6 @@
			Shop shop = shopClient.getShopById(order.getShopId()).getData();
			AppUser shopAppUser = appUserClient.getAppUserById(shop.getAppUserId());
			if(null != shopAppUser){
			BigDecimal balance = shopAppUser.getBalance();
			BigDecimal shopBalance = shop.getBalance();
			Integer lavePoint = shopAppUser.getLavePoint();
			Integer shopLavePoint = shop.getLavePoint();
			@@ -285,19 +289,6 @@
			appUserClient.editAppUserById(shopAppUser);
			shopClient.updateShop(shop);
			//添加明细记录
			if(!shopAppUser.getBalance().equals(balance)){
			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
			balanceChangeRecord.setAppUserId(shopAppUser.getId());
			balanceChangeRecord.setOrderId(order.getId());
			balanceChangeRecord.setChangeType(4);
			balanceChangeRecord.setBeforeAmount(balance);
			balanceChangeRecord.setChangeAmount(hxmd_price);
			balanceChangeRecord.setAfterAmount(shopAppUser.getBalance());
			balanceChangeRecord.setDelFlag(0);
			balanceChangeRecord.setCreateTime(LocalDateTime.now());
			balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
			}

			if(!shop.getBalance().equals(shopBalance)){
			ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
			shopBalanceStatement.setShopId(shop.getId());
			@@ -387,7 +378,6 @@
			if(null != shop1){
			AppUser bdShopAppUser = appUserClient.getAppUserById(shop1.getAppUserId());
			if(null != bdShopAppUser){
			BigDecimal balance = bdShopAppUser.getBalance();
			BigDecimal shopBalance = shop1.getBalance();
			Integer lavePoint = bdShopAppUser.getLavePoint();
			Integer shopLavePoint = shop1.getLavePoint();
			@@ -420,23 +410,10 @@
			appUserClient.editAppUserById(bdShopAppUser);
			shopClient.updateShop(shop1);
			//添加明细记录
			if(!bdShopAppUser.getBalance().equals(balance)){
			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
			balanceChangeRecord.setAppUserId(bdShopAppUser.getId());
			balanceChangeRecord.setOrderId(order.getId());
			balanceChangeRecord.setChangeType(4);
			balanceChangeRecord.setBeforeAmount(balance);
			balanceChangeRecord.setChangeAmount(bdmd_price);
			balanceChangeRecord.setAfterAmount(bdShopAppUser.getBalance());
			balanceChangeRecord.setDelFlag(0);
			balanceChangeRecord.setCreateTime(LocalDateTime.now());
			balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
			}

			if(!shop1.getBalance().equals(shopBalance)){
			ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
			shopBalanceStatement.setShopId(shop1.getId());
			shopBalanceStatement.setType(4);
			shopBalanceStatement.setType(1);
			shopBalanceStatement.setHistoricalBalance(shopBalance);
			shopBalanceStatement.setVariableAmount(bdmd_price);
			shopBalanceStatement.setBalance(shop1.getBalance());
			@@ -484,7 +461,6 @@
			if(null != shop2){
			AppUser sjShopAppUser = appUserClient.getAppUserById(shop2.getAppUserId());
			if(null != sjShopAppUser){
			BigDecimal balance = sjShopAppUser.getBalance();
			BigDecimal shopBalance = shop2.getBalance();
			Integer lavePoint = sjShopAppUser.getLavePoint();
			Integer shopLavePoint = shop2.getLavePoint();
			@@ -517,19 +493,6 @@
			appUserClient.editAppUserById(sjShopAppUser);
			shopClient.updateShop(shop2);
			//添加明细记录
			if(!sjShopAppUser.getBalance().equals(balance)){
			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
			balanceChangeRecord.setAppUserId(sjShopAppUser.getId());
			balanceChangeRecord.setOrderId(order.getId());
			balanceChangeRecord.setChangeType(4);
			balanceChangeRecord.setBeforeAmount(balance);
			balanceChangeRecord.setChangeAmount(bdmdsj_price);
			balanceChangeRecord.setAfterAmount(sjShopAppUser.getBalance());
			balanceChangeRecord.setDelFlag(0);
			balanceChangeRecord.setCreateTime(LocalDateTime.now());
			balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
			}

			if(!shop2.getBalance().equals(shopBalance)){
			ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
			shopBalanceStatement.setShopId(shop2.getId());