java/QianYunTong.git

			@@ -6,12 +6,10 @@
			import com.stylefeng.guns.modular.call.dao.OrderCallMapper;
			import com.stylefeng.guns.modular.call.model.OrderCall;
			import com.stylefeng.guns.modular.call.server.IOrderCallService;
			import com.stylefeng.guns.modular.system.model.OpenCity;
			import com.stylefeng.guns.modular.system.model.SysIntegral;
			import com.stylefeng.guns.modular.system.model.UserInfo;
			import com.stylefeng.guns.modular.system.service.IIncomeService;
			import com.stylefeng.guns.modular.system.service.ISysIntegralService;
			import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
			import com.stylefeng.guns.modular.system.service.IUserInfoService;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.util.UUIDUtil;
			@@ -39,6 +37,8 @@

			@Autowired
			private ISysIntegralService sysIntegralService;
			@Autowired
			private IOpenCityService openCityService;

			@Autowired
			private IIncomeService incomeService;
			@@ -77,7 +77,8 @@

			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());

			SysIntegral query1 = sysIntegralService.selectOne(new EntityWrapper<SysIntegral>().eq("companyId", orderCall.getCompanyId()));
			OpenCity openCity = openCityService.openCity1(orderCall.getStartLon().toString(), orderCall.getStartLat().toString());
			SysIntegral query1 = sysIntegralService.selectOne(new EntityWrapper<SysIntegral>().eq("openCityId", openCity.getId()));
			userInfo.setIntegral(userInfo.getIntegral() + (money.intValue() * query1.getIntegral()));//积分

			//添加交易明细
			@@ -112,7 +113,8 @@
			paymentRecordService.updateById(query);

			UserInfo userInfo = userInfoService.selectById(orderCall.getUserId());
			SysIntegral query1 = sysIntegralService.selectOne(new EntityWrapper<SysIntegral>().eq("companyId", orderCall.getCompanyId()));
			OpenCity openCity = openCityService.openCity1(orderCall.getStartLon().toString(), orderCall.getStartLat().toString());
			SysIntegral query1 = sysIntegralService.selectOne(new EntityWrapper<SysIntegral>().eq("openCityId", openCity.getId()));
			userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
			//添加交易明细
			transactionDetailsService.saveData(userInfo.getId(), "助老模式-感谢费", query.getAmount(), 2, 1, 1, 7, orderId);