java/IgoTravel.git

			@@ -582,6 +582,13 @@
			SysIntegral query1 = sysIntegralMapper.query(orderLogistics.getCompanyId());
			userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分

			//处理优惠券
			if(null != userCouponRecord){
			userCouponRecord.setState(2);
			userCouponRecord.setEndTime(new Date());
			userCouponRecordService.updateById(userCouponRecord);
			}

			//添加交易明细
			transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId);
			userInfoService.updateById(userInfo);
			@@ -607,6 +614,13 @@
			if(payType == 4){//现金支付
			SysIntegral query1 = sysIntegralMapper.query(orderLogistics.getCompanyId());
			userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分

			//处理优惠券和红包
			if(null != userCouponRecord){
			userCouponRecord.setState(2);
			userCouponRecord.setEndTime(new Date());
			userCouponRecordService.updateById(userCouponRecord);
			}

			//添加交易明细
			transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId);
			@@ -774,30 +788,31 @@
			orderLogisticsSpreadService.updateById(orderLogisticsSpread);

			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = orderLogistics.getType() == 4 ? company.getSameLogisticsMoney() : company.getCrossLogisticsMoney();
			BigDecimal d = null;
			BigDecimal c = null;
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderMoney).subtract(d);
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			d = new BigDecimal(orderMoney).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(orderMoney).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}

			Income income = incomeService.selectOne(new EntityWrapper<Income>().eq("userType", 1).eq("objectId", orderLogistics.getCompanyId()).eq("type", 2).eq("incomeId", orderLogistics.getId()).eq("orderType", orderLogistics.getType()));
			income.setMoney(income.getMoney() + d.doubleValue());
			incomeService.updateById(income);
			income = incomeService.selectOne(new EntityWrapper<Income>().eq("userType", 2).eq("objectId", orderLogistics.getCompanyId()).eq("type", 2).eq("incomeId", orderLogistics.getId()).eq("orderType", orderLogistics.getType()));
			income.setMoney(income.getMoney() + c.doubleValue());
			incomeService.updateById(income);
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			// Company company = companyService.selectById(orderLogistics.getCompanyId());
			// Double speMoney = orderLogistics.getType() == 4 ? company.getSameLogisticsMoney() : company.getCrossLogisticsMoney();
			// BigDecimal d = BigDecimal.ZERO;
			// BigDecimal c = BigDecimal.ZERO;
			// if(company.getIsSpeFixedOrProportional() == 2){//固定
			// d = new BigDecimal(speMoney);
			// c = new BigDecimal(orderMoney).subtract(d);
			// }
			// if(company.getIsSpeFixedOrProportional() == 1){//比例
			// d = new BigDecimal(orderMoney).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			// c = new BigDecimal(orderMoney).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			// }
			//
			// Income income = incomeService.selectOne(new EntityWrapper<Income>().eq("userType", 1).eq("objectId", orderLogistics.getCompanyId()).eq("type", 2).eq("incomeId", orderLogistics.getId()).eq("orderType", orderLogistics.getType()));
			// income.setMoney(income.getMoney() + d.doubleValue());
			// incomeService.updateById(income);
			// income = incomeService.selectOne(new EntityWrapper<Income>().eq("userType", 2).eq("objectId", orderLogistics.getCompanyId()).eq("type", 2).eq("incomeId", orderLogistics.getId()).eq("orderType", orderLogistics.getType()));
			// System.out.println("小件物流补差价income======"+income);
			// income.setMoney(income.getMoney() + c.doubleValue());
			// incomeService.updateById(income);
			// Driver driver = driverService.selectById(orderLogistics.getDriverId());
			// driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			// driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			// driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			// driverService.updateById(driver);

			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			new Thread(new Runnable() {
			@@ -837,6 +852,14 @@
			userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
			userInfoService.updateById(userInfo);

			//处理优惠券和红包
			if(null != orderLogistics.getCouponId()){
			UserCouponRecord userCouponRecord = userCouponRecordService.selectById(orderLogistics.getCouponId());
			userCouponRecord.setState(2);
			userCouponRecord.setEndTime(new Date());
			userCouponRecordService.updateById(userCouponRecord);
			}

			query.setState(2);
			query.setCode(order_id);
			paymentRecordService.updateById(query);