java/PlayPai.git

			@@ -1,21 +1,27 @@
			package com.dsh.account.service.impl;


			import com.alipay.api.AlipayApiException;
			import com.alipay.api.AlipayClient;
			import com.alipay.api.DefaultAlipayClient;
			import com.alipay.api.domain.AlipayTradeOrderSettleModel;
			import com.alipay.api.domain.OpenApiRoyaltyDetailInfoPojo;
			import com.alipay.api.domain.RoyaltyDetailInfos;
			import com.alipay.api.request.AlipayTradeOrderSettleRequest;
			import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
			import com.alipay.api.response.AlipayTradeOrderSettleResponse;
			import com.alipay.api.response.AlipayTradeQueryResponse;
			import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.dsh.account.dto.SelectDto;
			import com.dsh.account.dto.*;
			import com.dsh.account.entity.*;
			import com.dsh.account.enums.RechargeRecordEnum;
			import com.dsh.account.feignclient.activity.IntroduceRewardsClient;
			import com.dsh.account.feignclient.activity.MerChandiseClient;
			import com.dsh.account.feignclient.activity.MerChandiseStoreClient;
			import com.dsh.account.feignclient.activity.UserConponClient;
			import com.dsh.account.feignclient.activity.*;
			import com.dsh.account.feignclient.activity.model.*;
			import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
			import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
			import com.dsh.account.feignclient.competition.model.PaymentCompetition;
			import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
			import com.dsh.account.feignclient.course.CoursePackageClient;
			import com.dsh.account.feignclient.course.CoursePackageConfigClient;
			import com.dsh.account.feignclient.course.CoursePaymentClient;
			@@ -25,15 +31,14 @@
			import com.dsh.account.feignclient.other.RechargeConfigClient;
			import com.dsh.account.feignclient.other.SiteClient;
			import com.dsh.account.feignclient.other.StoreClient;
			import com.dsh.account.feignclient.other.model.SiteBooking;
			import com.dsh.account.feignclient.other.model.Store;
			import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
			import com.dsh.account.feignclient.other.model.TImgConfig;
			import com.dsh.account.mapper.*;
			import com.dsh.account.model.*;
			import com.dsh.account.model.AppUserByNameAndPhoneDTO;
			import com.dsh.account.model.dto.Coupon;
			import com.dsh.account.model.query.appUserQuery.QueryAppUser;
			import com.dsh.account.model.vo.DetailsListVo;
			import com.dsh.account.model.vo.QueryAppUserVO;
			import com.dsh.account.model.vo.classDetails.CourseVenue;
			import com.dsh.account.model.vo.classDetails.ExerciseVideo;
			@@ -44,6 +49,11 @@
			import com.dsh.account.service.TAppUserService;
			import com.dsh.account.util.*;
			import com.dsh.account.util.akeylogin.Md5Util;
			import com.dsh.account.vo.GroupCityInfoVO;
			import com.dsh.account.vo.entity.DayData;
			import com.dsh.account.vo.entity.MonthData;
			import com.dsh.account.vo.entity.WeekData;
			import com.dsh.account.vo.entity.YearData;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.domain.Page;
			import org.springframework.data.domain.PageImpl;
			@@ -60,6 +70,7 @@
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -137,9 +148,6 @@
			private CoursePackageConfigClient cpconClient;

			@Resource
			private PayMoneyUtil payMoneyUtil;

			@Resource
			private SiteClient stClient;
			@Autowired
			private TAppUserMapper appUserMapper;
			@@ -149,19 +157,50 @@

			@Autowired
			private IntroduceRewardsClient introduceRewardsClient;
			@Override
			public List<QueryAppUserVO> listAll(QueryAppUser query) {
			return appUserMapper.listAll(query);

			private String aliAppid = "2021004105665036";//支付宝appid

			private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥

			private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥

			private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
			@Resource
			private UserConponClient userConponClient;
			@Autowired
			private TAppUserService appUserService;
			@Resource
			private MerChandiseClient merChandiseClient;

			@Autowired
			private PayMoneyUtil payMoneyUtil;

			@Resource
			private UserCouponPaymentClient userCouponPaymentClient;





			// 对数据进行分页处理的方法
			private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) {
			int start = (int) pageable.getOffset();
			int end = Math.min((start + pageable.getPageSize()), dataList.size());
			return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
			}

			@Override
			public HashMap<String,Object> weeksOfCourseDetailsList(Integer appUserId, Integer stuId, String time, Integer storeId,String lon,String lat) {
			public List<QueryAppUserVO> listAll(QueryAppUser query) {
			return appUserMapper.listAll(query);
			}

			@Override
			public HashMap<String, Object> weeksOfCourseDetailsList(Integer appUserId, Integer stuId, String time, Integer storeId, String lon, String lat) {
			// 门店id 查出所有课程
			HashMap<String, Object> map = paymentClient.weeksOfCourseDetailsList(new CourseDetailReq(appUserId, stuId, time, storeId,lon,lat));
			HashMap<String, Object> map = paymentClient.weeksOfCourseDetailsList(new CourseDetailReq(appUserId, stuId, time, storeId, lon, lat));

			return map;
			}


			@Override
			public List<SelectDto> getSelects(List<Integer> studentIds) {
			@@ -169,53 +208,142 @@
			}

			@Override
			public ClassInfoVo queryUserOfStus(Integer id) {
			TAppUser tAppUser = this.baseMapper.selectById(id);
			ClassInfoVo classInfoVo = new ClassInfoVo();
			if (ToolUtil.isNotEmpty(tAppUser)){
			List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
			.eq("appUserId",tAppUser.getId())
			.eq("state",1)
			.eq("isDefault",1));
			if (tStudents.size() > 0 ){
			TStudent tStudent = tStudents.get(0);
			classInfoVo.setStuId(tStudent.getId());
			classInfoVo.setIsThere(1);
			classInfoVo.setStuImg(tStudent.getHeadImg());
			classInfoVo.setStuSex(tStudent.getSex());
			classInfoVo.setStuAge(DateUtil.age(tStudent.getBirthday()));
			classInfoVo.setStuName(tStudent.getName());
			classInfoVo.setHeight(tStudent.getHeight());
			classInfoVo.setWeight(tStudent.getWeight());
			classInfoVo.setBmi(tStudent.getBmi());
			classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
			public Object changeState(AdvertisementChangeStateDTO dto) {
			return appUserMapper.changeState(dto.getIds(), dto.getState());
			}

			List<RegisteredCourse> courseList = new ArrayList<>();
			List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
			List<Integer> coursePackIds = new ArrayList<>();
			if (stuCoursePayment.size() > 0){
			coursePackIds = stuCoursePayment.stream().map(StuCourseResp::getCourseId).collect(Collectors.toList());
			for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
			RegisteredCourse course = new RegisteredCourse();
			course.setCourseId(tCoursePackagePayment.getCourseId());
			course.setCourseName(tCoursePackagePayment.getCourseName());
			course.setTotalNums(ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
			course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
			course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
			course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
			courseList.add(course);
			@Override
			public List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto) {
			return appUserMapper.queryAPPUserByNameAndPhone(dto);
			}

			@Override
			public List<YearData> getYearUserCount(UserInfoQueryDTO dto) {
			return appUserMapper.getYearUserCount(dto);
			}

			@Override
			public List<MonthData> getMonthUserCount(UserInfoQueryDTO dto) {
			List<MonthData> monthUserCount = appUserMapper.getMonthUserCount(dto);
			for (int i = 1; i <= 12; i++) {
			String time = String.valueOf(i);
			if (i < 10) {
			time = "0" + time;
			}
			monthUserCount.add(Optional.ofNullable(monthUserCount.get(i)).orElse(new MonthData(time, 0)));
			}
			return monthUserCount.stream().sorted(Comparator.comparing(MonthData::getMonth)).collect(Collectors.toList());
			}

			@Override
			public WeekData getWeekUserCount4(UserInfoQueryDTO dto) {
			return appUserMapper.getWeekUserCount4(dto);
			}

			@Override
			public WeekData getWeekUserCount3(UserInfoQueryDTO dto) {
			return appUserMapper.getWeekUserCount3(dto);
			}

			@Override
			public WeekData getWeekUserCount2(UserInfoQueryDTO dto) {
			return appUserMapper.getWeekUserCount2(dto);
			}

			@Override
			public WeekData getWeekUserCount1(UserInfoQueryDTO dto) {
			return appUserMapper.getWeekUserCount1(dto);
			}

			@Override
			public List<DayData> getDayUserCount(UserInfoQueryDTO dto) {
			List<DayData> dayUserCount = appUserMapper.getDayUserCount(dto);
			if (dayUserCount.size() < 7) {
			for (int i = 1; i <= 6; i++) {
			String time = LocalDate.now().minusDays(i).toString();
			for (DayData dayData : dayUserCount) {
			if (!time.equals(dayData.getDay())) {
			dayUserCount.add(new DayData(time, 0));
			}
			}
			classInfoVo.setCourseList(courseList);
			List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
			System.out.println(stuCourseOfVideoList);
			classInfoVo.setExerciseVideoList(stuCourseOfVideoList);
			}else {
			classInfoVo.setIsThere(2);
			List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
			if (tImgConfigs.size() > 0){
			classInfoVo.setImgs(tImgConfigs.get(0).getContent());
			}
			}
			dayUserCount.forEach(dayData -> dayData.setDay(dayData.getDay().split("-")[2]));
			return dayUserCount.stream().sorted(Comparator.comparing(DayData::getDay)).collect(Collectors.toList());
			}

			@Override
			public List<GroupCityInfoVO> groupCityInfo(UserInfoQueryDTO dto) {
			return appUserMapper.groupCityInfo(dto);
			}

			@Override
			public ClassInfoVo queryUserOfStus(Integer id, Integer uid) {
			TAppUser tAppUser = this.baseMapper.selectById(uid);
			ClassInfoVo classInfoVo = new ClassInfoVo();
			List<TStudent> tStudents = new ArrayList<>();
			if (id != null) {
			tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
			.eq("id", id).eq("state", 1));

			if (tStudents.size() == 0) {
			tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
			.eq("appUserId", tAppUser.getId())
			.eq("state", 1));
			}
			} else {
			tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
			.eq("appUserId", tAppUser.getId())
			.eq("state", 1)
			.eq("isDefault", 1));
			if (tStudents.isEmpty()) {
			tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
			.eq("appUserId", tAppUser.getId())
			.eq("state", 1))
			;
			}
			}
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
			if (tStudents.size() > 0) {
			TStudent tStudent = tStudents.get(0);
			classInfoVo.setStuId(tStudent.getId());
			classInfoVo.setIsThere(1);
			classInfoVo.setStuImg(tStudent.getHeadImg());
			classInfoVo.setStuSex(tStudent.getSex());
			classInfoVo.setStuAge(DateUtil.age(tStudent.getBirthday()));
			classInfoVo.setStuName(tStudent.getName());
			classInfoVo.setHeight(tStudent.getHeight());
			classInfoVo.setWeight(tStudent.getWeight());
			classInfoVo.setBmi(tStudent.getBmi());
			if (tStudent.getBmi() != null) {
			classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
			}
			List<RegisteredCourse> courseList = new ArrayList<>();
			List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
			if (stuCoursePayment.size() > 0) {
			for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
			RegisteredCourse course = new RegisteredCourse();
			course.setId(tCoursePackagePayment.getId());
			course.setCourseId(tCoursePackagePayment.getCourseId());
			course.setCourseName(tCoursePackagePayment.getCourseName());
			course.setTotalNums(ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
			course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
			course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums()) ? 0 : tCoursePackagePayment.getResidueNums());
			course.setPeriodOfValidity(sdf.format(tStudent.getValidity()));
			course.setIsAble(tCoursePackagePayment.getIsAble());
			course.setCourseType(tCoursePackagePayment.getCourseType());
			courseList.add(course);
			}
			}
			classInfoVo.setCourseList(courseList);
			List<ExerciseVideo> query = voclClient.query(tStudent.getId());
			classInfoVo.setExerciseVideoList(query);

			} else {
			classInfoVo.setIsThere(2);
			List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
			if (tImgConfigs.size() > 0) {
			classInfoVo.setImgs(tImgConfigs.get(0).getContent());
			}
			}
			return classInfoVo;
			@@ -223,12 +351,13 @@

			/**
			* 处理数据
			*
			* @param storeOfCourses
			* @param longitude
			* @param latitude
			* @return
			*/
			public List<CourseVenue> dealDatas(List<CourseOfStoreVo> storeOfCourses, String longitude , String latitude){
			public List<CourseVenue> dealDatas(List<CourseOfStoreVo> storeOfCourses, String longitude, String latitude) {
			List<CourseVenue> courseVenues = new ArrayList<>();
			Map<Integer, List<CourseOfStoreVo>> map = storeOfCourses.stream().collect(Collectors.groupingBy(CourseOfStoreVo::getStoreId));
			for (Map.Entry<Integer, List<CourseOfStoreVo>> integerListEntry : map.entrySet()) {
			@@ -237,9 +366,9 @@
			CourseVenue courseVenue = new CourseVenue();
			courseVenue.setStoreId(storeId);
			courseVenue.setAreaName(value.get(0).getCourseName());
			if (ToolUtil.isEmpty(longitude) && ToolUtil.isEmpty(latitude)){
			courseVenue.setSiteDistance(0+"");
			}else {
			if (ToolUtil.isEmpty(longitude) && ToolUtil.isEmpty(latitude)) {
			courseVenue.setSiteDistance(0 + "");
			} else {
			courseVenue.setSiteDistance(LonlatUtils.distance(Double.parseDouble(longitude), Double.parseDouble(latitude),
			Double.parseDouble(value.get(0).getLon()), Double.parseDouble(value.get(0).getLat())) + "");
			}
			@@ -263,28 +392,28 @@
			return courseVenues;
			}


			/**
			* 获取短信验证码
			* @param type 1：登录，2：注册，3：修改密码，4：忘记密码
			*
			* @param type 1：登录，2：注册，3：修改密码，4：忘记密码
			* @param phone
			* @return
			* @throws Exception
			*/
			@Override
			public ResultUtil getSMSCode(Integer type, String phone) throws Exception {
			if(type == 2){
			if (type == 2) {
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
			if(null != tAppUser){
			if (null != tAppUser) {
			return ResultUtil.error("账号已存在");
			}
			}
			String numberRandom = UUIDUtil.getNumberRandom(6);
			String templateCode = "";
			if(type == 1 \|\| type == 2){
			if (type == 1 \|\| type == 2) {
			templateCode = "SMS_161275250";
			}
			if(type == 3 \|\| type == 4){
			if (type == 3 \|\| type == 4) {
			templateCode = "SMS_160960014";
			}
			aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + numberRandom + "\"}");
			@@ -292,63 +421,93 @@
			return ResultUtil.success();
			}


			/**
			* 注册用户
			*
			* @return
			* @throws Exception
			*/
			@Override
			public ResultUtil addAppUser(AddAppUserVo addAppUserVo) throws Exception {
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", addAppUserVo.getPhone()).ne("state", 3));
			if(null != tAppUser){
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>()
			.eq("phone", addAppUserVo.getPhone())
			.ne("state", 3));
			if (null != tAppUser) {
			return ResultUtil.error("账号已存在");
			}
			String value = redisUtil.getValue(addAppUserVo.getPhone());
			if(!"123456".equals(addAppUserVo.getCode()) && (ToolUtil.isEmpty(value) \|\| !value.equals(addAppUserVo.getCode()))){
			if (!"123456".equals(addAppUserVo.getCode()) && (ToolUtil.isEmpty(value) \|\| !value.equals(addAppUserVo.getCode()))) {
			return ResultUtil.error("验证码无效");
			}

			tAppUser = new TAppUser();
			tAppUser.setCode(UUIDUtil.getNumberRandom(16));
			tAppUser.setPhone(addAppUserVo.getPhone());
			tAppUser.setPassword(Md5Util.MD5Encode(addAppUserVo.getPassword(), null));
			tAppUser.setPassword(addAppUserVo.getPassword());
			tAppUser.setIsVip(0);
			tAppUser.setState(1);
			tAppUser.setInsertTime(new Date());
			this.baseMapper.insert(tAppUser);


			tAppUser.setProvince("");
			tAppUser.setProvinceCode("");
			tAppUser.setCity("");
			tAppUser.setCityCode("");
			// 注册用户
			int insert = this.baseMapper.insert(tAppUser);
			// 介绍有礼
			if(addAppUserVo.getReferralUserId()!=null){
			if (addAppUserVo.getReferralUserId() != null \|\| ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())) {
			if (ToolUtil.isEmpty(addAppUserVo.getLat()) \|\| ToolUtil.isEmpty(addAppUserVo.getLon())) {
			return ResultUtil.error("请先开启定位", "");
			}
			Map<String, String> geocode = gdMapGeocodingUtil.geocode(addAppUserVo.getLon(), addAppUserVo.getLat());
			Integer num=0;
			if(null != geocode){
			Integer num = 0;
			Integer activityId = null;
			if (null != geocode) {
			String province = geocode.get("province");
			String provinceCode = geocode.get("provinceCode");
			String city = geocode.get("city");
			String cityCode = geocode.get("cityCode");
			num = introduceRewardsClient.getGiftList(cityCode);
			// 根据所在市code 查询是否有介绍有礼活动
			IntroduceRewards res = introduceRewardsClient.getGiftList(cityCode);
			if (res != null) {
			num = res.getGiveClass();
			activityId = res.getId();
			if (ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())) {
			List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>()
			.eq(TAppUser::getPhone, addAppUserVo.getInvitePhone()));
			if (tAppUsers.size() > 0) {
			addAppUserVo.setReferralUserId(tAppUsers.get(0).getId());
			}
			}
			if (num != 0) {
			TAppGift tAppGift = new TAppGift();
			TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>()
			.eq("phone", addAppUserVo.getInvitePhone()));
			if (phone == null) {
			return ResultUtil.error("推荐人手机号未注册玩湃会员！");
			} else {
			tAppGift.setUserName(phone.getName());
			tAppGift.setUserPhone(phone.getPhone());
			}
			tAppGift.setUserId(addAppUserVo.getReferralUserId());
			tAppGift.setNum(num);
			tAppGift.setShareUserId(tAppUser.getId());
			tAppGift.setShareUserName(tAppUser.getPhone());
			tAppGift.setShareUserPhone(tAppUser.getPhone());
			tAppGift.setActivityId(activityId);
			tAppGift.setInsertTime(new Date());
			appGiftService.save(tAppGift);
			}
			}
			}
			TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, addAppUserVo.getReferralUserId()));
			if(one!=null){
			one.setNum(one.getNum()+num);
			appGiftService.updateById(one);
			}else {
			TAppGift tAppGift = new TAppGift();
			tAppGift.setUserId(addAppUserVo.getReferralUserId());
			tAppGift.setNum(num);
			appGiftService.save(tAppGift);
			}

			}


			return ResultUtil.success();
			}


			/**
			* 账号密码登录
			*
			* @param phone
			* @param password
			* @return
			@@ -357,95 +516,112 @@
			@Override
			public ResultUtil loginPassword(String phone, String password) throws Exception {
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
			if(null == tAppUser){
			if (null == tAppUser) {
			return ResultUtil.error("请先注册", "");
			}
			if(tAppUser.getState() == 2){
			return ResultUtil.error("您的账号已被冻结", "");
			if (tAppUser.getState() == 2) {
			return ResultUtil.errorCode("您的账号已被冻结", "");
			}
			password = Md5Util.MD5Encode(password, null);
			if(!tAppUser.getPassword().equals(password)){
			// password = Md5Util.MD5Encode(password, null);
			if (!tAppUser.getPassword().equals(password)) {
			return ResultUtil.error("账号密码错误", "");
			}
			String token = getToken(tAppUser);
			return ResultUtil.success(token);
			}


			/**
			* 验证码登录
			*
			* @return
			* @throws Exception
			*/
			@Override
			public ResultUtil loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) throws Exception {
			String value = redisUtil.getValue(loginSMSCodeVo.getPhone());
			if(!"123456".equals(loginSMSCodeVo.getCode()) && (ToolUtil.isEmpty(value) \|\| !value.equals(loginSMSCodeVo.getCode()))){
			if (!"123456".equals(loginSMSCodeVo.getCode()) && (ToolUtil.isEmpty(value) \|\| !value.equals(loginSMSCodeVo.getCode()))) {
			return ResultUtil.error("验证码无效", "");
			}
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", loginSMSCodeVo.getPhone()).ne("state", 3));
			if(null == tAppUser){
			if (null == tAppUser) {
			tAppUser = new TAppUser();
			tAppUser.setCode(UUIDUtil.getNumberRandom(16));
			tAppUser.setPhone(loginSMSCodeVo.getPhone());
			tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
			tAppUser.setIsVip(0);
			tAppUser.setState(1);
			tAppUser.setInsertTime(new Date());
			this.baseMapper.insert(tAppUser);
			}
			if(tAppUser.getState() == 2){
			if (tAppUser.getState() == 2) {
			return ResultUtil.error("您的账号已被冻结", "");
			}
			String token = getToken(tAppUser);
			return ResultUtil.success(token);
			}


			/**
			* 微信登录
			*
			* @return
			* @throws Exception
			*/
			@Override
			public ResultUtil loginWechat(LoginWeChatVo loginWechatVo) throws Exception {
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("openid", loginWechatVo.getOpenId()).ne("state", 3));
			if(null == tAppUser){

			if (null == tAppUser) {
			tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", loginWechatVo.getPhone()).ne("state", 3));
			if(null == tAppUser){
			if (null == tAppUser) {
			tAppUser = new TAppUser();
			tAppUser.setCode(UUIDUtil.getNumberRandom(16));
			tAppUser.setOpenid(loginWechatVo.getOpenId());
			tAppUser.setPhone(loginWechatVo.getPhone());
			tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
			tAppUser.setIsVip(0);
			tAppUser.setName(loginWechatVo.getNickname());
			tAppUser.setHeadImg(loginWechatVo.getHeadimgurl());
			tAppUser.setGender(loginWechatVo.getSex());
			tAppUser.setState(1);
			tAppUser.setInsertTime(new Date());
			tAppUser.setProvince("");
			tAppUser.setProvinceCode("");
			tAppUser.setCity("");
			tAppUser.setCityCode("");
			this.baseMapper.insert(tAppUser);
			}
			}
			if(tAppUser.getState() == 2){
			if (tAppUser.getState() == 2) {
			return ResultUtil.error("您的账号已被冻结", "");
			}

			if(ToolUtil.isNotEmpty(tAppUser.getOpenid())){
			if (ToolUtil.isEmpty(tAppUser.getOpenid())) {
			tAppUser.setOpenid(loginWechatVo.getOpenId());
			}
			if(ToolUtil.isNotEmpty(tAppUser.getPhone())){
			if (ToolUtil.isEmpty(tAppUser.getPhone())) {
			tAppUser.setPhone(loginWechatVo.getPhone());
			}
			this.updateById(tAppUser);

			String token = getToken(tAppUser);
			return ResultUtil.success(token);
			}

			HashMap<String, String> map = new HashMap<>();
			map.put("token", token);
			if (ToolUtil.isEmpty(tAppUser.getPhone())) {
			map.put("isBind", "0");
			} else {
			map.put("isBind", "1");
			}
			return ResultUtil.success(map);
			}

			/**
			* 获取JWT token和存储个人信息
			*
			* @param appUser
			* @return
			*/
			private String getToken(TAppUser appUser){
			private String getToken(TAppUser appUser) {
			String randomKey = jwtTokenUtil.getRandomKey();
			String token = jwtTokenUtil.generateToken(appUser.getId().toString(), randomKey);
			redisUtil.setStrValue(token.substring(token.length() - 32), String.valueOf(appUser.getId()), 7 * 24 * 60 * 60);
			@@ -454,9 +630,9 @@
			return token;
			}


			/**
			* 修改密码
			*
			* @param phone
			* @param code
			* @param password
			@@ -466,18 +642,44 @@
			@Override
			public ResultUtil updatePassword(String phone, String code, String password) throws Exception {
			String value = redisUtil.getValue(phone);
			if(!"123456".equals(code) && (ToolUtil.isEmpty(value) \|\| !value.equals(code))){
			if (!"123456".equals(code) && (ToolUtil.isEmpty(value) \|\| !value.equals(code))) {
			return ResultUtil.error("验证码无效");
			}
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
			if(tAppUser.getState() == 2){
			if (tAppUser == null) {
			return ResultUtil.error("该账号未注册", "");
			}
			if (tAppUser.getState() == 2) {
			return ResultUtil.error("您的账号已被冻结", "");
			}
			tAppUser.setPassword(Md5Util.MD5Encode(password, null));
			if (tAppUser.getCode() == null) {
			tAppUser.setCode(UUIDUtil.getNumberRandom(16));
			}
			tAppUser.setPassword(password);
			this.updateById(tAppUser);
			return ResultUtil.success();
			}

			@Override
			public ResultUtil updatePassword1(String phone, String code, String password) throws Exception {
			String value = redisUtil.getValue(phone);
			if (!"123456".equals(code) && (ToolUtil.isEmpty(value) \|\| !value.equals(code))) {
			return ResultUtil.error("验证码无效");
			}
			TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
			if (tAppUser == null) {
			return ResultUtil.error("该账号未注册", "");
			}
			if (tAppUser.getState() == 2) {
			return ResultUtil.error("您的账号已被冻结", "");
			}
			if (tAppUser.getCode() == null) {
			tAppUser.setCode(UUIDUtil.getNumberRandom(16));
			}
			tAppUser.setPassword(password);
			this.updateById(tAppUser);
			return ResultUtil.success();
			}

			/**
			* 定时任务修改到期会员的状态
			@@ -487,9 +689,9 @@
			this.baseMapper.membershipEnd();
			}


			/**
			* 获取加入玩湃首页数据
			*
			* @param lon
			* @param lat
			* @return
			@@ -498,9 +700,9 @@
			@Override
			public JoinPlayPaiVo queryJoinPlayPai(Integer uid, String lon, String lat) throws Exception {
			TAppUser appUser = this.getById(uid);
			if(ToolUtil.isEmpty(appUser.getProvince()) && ToolUtil.isNotEmpty(lon)){
			if (ToolUtil.isEmpty(appUser.getProvince()) && ToolUtil.isNotEmpty(lon)) {
			Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
			if(null != geocode){
			if (null != geocode) {
			String province = geocode.get("province");
			String provinceCode = geocode.get("provinceCode");
			String city = geocode.get("city");
			@@ -516,12 +718,12 @@

			JoinPlayPaiVo joinPlayPaiVo = new JoinPlayPaiVo();
			joinPlayPaiVo.setIsVip(appUser.getIsVip());
			if(ToolUtil.isEmpty(lon) \|\|ToolUtil.isEmpty(lat)){
			if (ToolUtil.isEmpty(lon) \|\| ToolUtil.isEmpty(lat)) {
			return joinPlayPaiVo;
			}

			Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
			if(null != geocode){
			if (null != geocode) {
			String provinceCode = geocode.get("provinceCode");
			String cityCode = geocode.get("cityCode");
			List<Store> stores = storeClient.queryStoreList(new QueryStoreList(provinceCode, cityCode));
			@@ -530,7 +732,7 @@
			for (Store store : stores) {
			Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
			Double wgs84 = distance.get("WGS84");
			if(s == null \|\| d.compareTo(wgs84) < 0){
			if (s == null \|\| d > wgs84) {
			s = store;
			d = wgs84;
			}
			@@ -540,32 +742,44 @@
			joinPlayPaiVo.setLat(s.getLat());
			joinPlayPaiVo.setStoreId(s.getId());
			joinPlayPaiVo.setPhone(s.getPhone());
			joinPlayPaiVo.setProvince(s.getProvince());
			joinPlayPaiVo.setProvinceCode(s.getProvinceCode());
			joinPlayPaiVo.setCity(s.getCity());
			joinPlayPaiVo.setCityCode(s.getCityCode());
			}
			return joinPlayPaiVo;
			}

			@Override
			public IndexOfUserBenefirVo queryBenefitDetails(Integer appUserId) {
			public IndexOfUserBenefirVo queryBenefitDetails(Integer appUserId, String lon, String lat) {
			IndexOfUserBenefirVo benefirVo = new IndexOfUserBenefirVo();

			TAppUser appUser = this.getById(appUserId);
			benefirVo.setUserHeadImg(appUser.getHeadImg());
			if (appUser.getHeadImg() != null) {
			benefirVo.setUserHeadImg(appUser.getHeadImg());
			} else {
			benefirVo.setUserHeadImg("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/630864764d3c4e98822ff976a2389559.jpg");
			}
			benefirVo.setUserName(appUser.getName());
			benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
			benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
			if (appUser.getIsVip() == 1){
			if (appUser.getIsVip() == 1) {
			benefirVo.setIsMember("年度会员");
			}else {
			} else {
			benefirVo.setIsMember("普通用户");
			}
			List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods();

			Location location = new Location();
			location.setLat(lat);
			location.setLon(lon);
			List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods(location);
			benefirVo.setCommodities(convertibleGoods);
			benefirVo.setImage(icfgClient.getImageConfig());
			return benefirVo;
			}

			@Override
			public List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
			public List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
			List<ConsumeDetail> details = new ArrayList<>();

			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
			@@ -586,19 +800,19 @@
			requestVo.setAppUserId(appUserId);
			// 1.赛事报名
			BillingRequestVo allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo);
			if (ToolUtil.isNotEmpty(allCompetitionPayRecord.getRequests())){
			if (ToolUtil.isNotEmpty(allCompetitionPayRecord.getRequests())) {
			for (BillingRequest paymentCompetition : allCompetitionPayRecord.getRequests()) {
			ConsumeDetail consumeDetail = new ConsumeDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
			consumeDetail.setConsumeTime(paymentCompetition.getTime());
			consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
			consumeDetail.setType(2);
			details.add(consumeDetail);
			consumeDetail.setType(1);
			}
			}
			// 2.取消赛事报名
			BillingRequestVo cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo);
			if (ToolUtil.isNotEmpty(cancelOrderOfUserPayRecord.getRequests())){
			if (ToolUtil.isNotEmpty(cancelOrderOfUserPayRecord.getRequests())) {
			for (BillingRequest paymentCompetition : cancelOrderOfUserPayRecord.getRequests()) {
			ConsumeDetail consumeDetail = new ConsumeDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
			@@ -609,34 +823,64 @@
			}
			}
			// 3.课包购买
			BillingRequestVo amountPayRecord = paymentClient.getAmountPayRecord(requestVo);
			if (ToolUtil.isNotEmpty(amountPayRecord.getRequests())){
			for (BillingRequest coursePackagePayment : amountPayRecord.getRequests()) {
			ConsumeDetail consumeDetail = new ConsumeDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg());
			consumeDetail.setConsumeTime(coursePackagePayment.getTime());
			consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
			consumeDetail.setType(2);
			details.add(consumeDetail);
			}
			// BillingRequestVo amountPayRecord = paymentClient.getAmountPayRecord(requestVo);
			// if (ToolUtil.isNotEmpty(amountPayRecord.getRequests())){
			// for (BillingRequest coursePackagePayment : amountPayRecord.getRequests()) {
			// ConsumeDetail consumeDetail = new ConsumeDetail();
			// consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg());
			// consumeDetail.setConsumeTime(coursePackagePayment.getTime());
			// consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
			// consumeDetail.setType(2);
			// details.add(consumeDetail);
			// }
			// }

			//2.0
			List<CourseCounsum> courseCounsums = paymentClient.getConsumes(requestVo);

			for (CourseCounsum courseCounsum : courseCounsums) {
			ConsumeDetail consumeDetail = new ConsumeDetail();
			String[] split = courseCounsum.getReason().split(";");
			consumeDetail.setConsumeName(split[0]);
			consumeDetail.setConsumeTime(simpleDateFormat.format(courseCounsum.getInsertTime()));
			// if (courseCounsum.getChangeType()==3){
			consumeDetail.setConsumeAmount("-" + split[1]);
			consumeDetail.setType(2);
			// }
			//
			// consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
			// consumeDetail.setType(2);
			details.add(consumeDetail);
			}


			// 4.场地预约
			RequestOfTypeVo allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
			if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())){
			if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())) {
			for (BillingRequestOfType booking : allSiteBookingList.getRequest()) {
			ConsumeDetail consumeDetail = new ConsumeDetail();
			if (booking.getStatus() != 5){
			if (booking.getStatus() != 5) {
			consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
			consumeDetail.setConsumeAmount("-" + booking.getAmount());
			consumeDetail.setConsumeTime(booking.getTime());
			consumeDetail.setType(2);
			}else {
			consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
			consumeDetail.setConsumeAmount("+" + booking.getAmount());
			consumeDetail.setConsumeTime(booking.getTime());
			consumeDetail.setType(1);
			details.add(consumeDetail);
			} else {
			ConsumeDetail consumeDetail1 = new ConsumeDetail();
			consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
			consumeDetail1.setConsumeAmount("+" + booking.getAmount());
			consumeDetail1.setConsumeTime(booking.getTime());
			consumeDetail1.setType(1);
			details.add(consumeDetail1);
			ConsumeDetail consumeDetail2 = new ConsumeDetail();
			consumeDetail2.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
			consumeDetail2.setConsumeAmount("-" + booking.getAmount());
			consumeDetail2.setConsumeTime(booking.getTime1());
			consumeDetail2.setType(2);
			details.add(consumeDetail2);

			}
			details.add(consumeDetail);
			// details.add(consumeDetail);
			}
			}

			@@ -664,14 +908,21 @@
			if (rechargeRecords.size() > 0) {
			for (RechargeRecords rechargeRecord : rechargeRecords) {
			ConsumeDetail consumeDetail = new ConsumeDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins());
			consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins() + "币");
			consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
			consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount());
			consumeDetail.setType(2);
			details.add(consumeDetail);
			}
			}
			if (details.size() > 0 ){

			//8.积分商场

			List<ConsumeDetail> consumeDetails = mcClient.getConsumeDetails(requestVo);
			details.addAll(consumeDetails);


			if (details.size() > 0) {
			Collections.sort(details, new Comparator<ConsumeDetail>() {
			@Override
			public int compare(ConsumeDetail record1, ConsumeDetail record2) {
			@@ -689,7 +940,7 @@
			}
			});

			if (ToolUtil.isNotEmpty(recordId)){
			if (ToolUtil.isNotEmpty(recordId)) {
			details = details.stream()
			.filter(response -> Objects.equals(response.getType(), recordId))
			.collect(Collectors.toList());
			@@ -701,7 +952,7 @@
			@Override
			public void cancellation(Integer appUserId) {
			TAppUser tAppUser = this.baseMapper.selectById(appUserId);
			if (null != tAppUser){
			if (null != tAppUser) {
			tAppUser.setState(3);
			this.baseMapper.updateById(tAppUser);
			}
			@@ -713,14 +964,14 @@
			TAppUser tAppUser = this.baseMapper.selectById(appUserId);
			List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig();
			System.out.println(rechargeConfig);
			if (rechargeConfig.size() > 0 ){
			if (rechargeConfig.size() > 0) {
			for (Map<String, Object> stringObjectMap : rechargeConfig) {
			RechargeCentVo vo = new RechargeCentVo();
			Double money = (Double) stringObjectMap.get("money");
			vo.setAmount(BigDecimal.valueOf(money) );
			if (tAppUser.getIsVip() == 1){
			vo.setAmount(BigDecimal.valueOf(money));
			if (tAppUser.getIsVip() == 1 && tAppUser.getVipEndTime().after(new Date())) {
			vo.setWpGold((Integer) stringObjectMap.get("MemberCoins"));
			}else {
			} else {
			vo.setWpGold((Integer) stringObjectMap.get("usersCoins"));
			}
			centVos.add(vo);
			@@ -730,7 +981,7 @@
			}

			@Override
			public List<Goods> queryAppUserIntegral(MallRequest request ) {
			public List<Goods> queryAppUserIntegral(MallRequest request) {
			List<Goods> goods = new ArrayList<>();

			CommodityRequest commodityRequest = new CommodityRequest();
			@@ -749,19 +1000,21 @@
			if (vicinityGood.getRedemptionMethod() == 1) {
			commodity.setIntegral(vicinityGood.getIntegral().intValue());
			} else {
			commodity.setIntegral(vicinityGood.getIntegral().intValue());
			commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral()) ? 0 : vicinityGood.getIntegral());
			commodity.setAmount(vicinityGood.getCash());
			}
			commodity.setBelongsType(vicinityGood.getUserPopulation());
			commodity.setGoodsType(1);
			commodity.setUseScope(vicinityGood.getUseScope());
			commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
			List<Integer> integers = mcsClient.queryPointMerStoreIds(vicinityGood.getId());
			commodity.setShopIds(integers);
			break;
			case 2:
			commodity.setGoodId(vicinityGood.getCoursePackageId());
			commodity.setGoodId(vicinityGood.getId());
			CoursePackage coursePackage = cpageClient.queryCoursePackageById(vicinityGood.getCoursePackageId());
			commodity.setGoodImg(coursePackage.getCoverDrawing());
			// commodity.setGoodImg(coursePackage.getCoverDrawing());
			commodity.setGoodImg(vicinityGood.getCover());
			commodity.setGoodName(coursePackage.getName());
			commodity.setCondition(vicinityGood.getRedemptionMethod());
			if (vicinityGood.getRedemptionMethod() == 1) {
			@@ -772,6 +1025,8 @@
			}
			commodity.setBelongsType(vicinityGood.getUserPopulation());
			commodity.setGoodsType(2);
			commodity.setUseScope(vicinityGood.getUseScope());

			commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
			commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
			break;
			@@ -779,11 +1034,13 @@
			commodity.setGoodId(vicinityGood.getId());
			commodity.setGoodName(vicinityGood.getName());
			commodity.setGoodImg(vicinityGood.getCover());
			commodity.setUseScope(vicinityGood.getUseScope());

			commodity.setCondition(vicinityGood.getRedemptionMethod());
			if (vicinityGood.getRedemptionMethod() == 1) {
			commodity.setIntegral(vicinityGood.getIntegral().intValue());
			} else {
			commodity.setIntegral(vicinityGood.getIntegral().intValue());
			commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral()) ? 0 : vicinityGood.getIntegral());
			commodity.setAmount(vicinityGood.getCash());
			}
			commodity.setBelongsType(vicinityGood.getUserPopulation());
			@@ -792,11 +1049,13 @@
			commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
			break;
			default:

			break;
			}
			goods.add(commodity);
			}
			}

			List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest);
			if (allCoupons.size() > 0) {
			for (Coupon allCoupon : allCoupons) {
			@@ -808,50 +1067,54 @@
			if (allCoupon.getRedemptionMethod() == 1) {
			commodity.setIntegral(allCoupon.getIntegral().intValue());
			} else {
			commodity.setIntegral(allCoupon.getIntegral().intValue());
			if (allCoupon.getIntegral() != null) {
			commodity.setIntegral(allCoupon.getIntegral().intValue());
			}
			commodity.setAmount(allCoupon.getCash());
			}
			commodity.setBelongsType(allCoupon.getUserPopulation());
			commodity.setGoodsType(4);
			commodity.setShopIds(ucponClient.getCouponStoreIds(allCoupon.getId()));
			commodity.setNums(ucponClient.getRedeemedQuantity(allCoupon.getId()));
			commodity.setUseScope(allCoupon.getUseScope());
			goods.add(commodity);
			}
			}

			if (StringUtils.hasText(request.getSearch())){
			if (goods.size() > 0 ){
			if (StringUtils.hasText(request.getSearch())) {
			if (goods.size() > 0) {
			goods = goods.stream()
			.filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
			.collect(Collectors.toList());
			}
			}
			// 2.0 门店筛选
			if (request.getShopId()!=null){
			if (goods.size() > 0 ){
			if (request.getShopId() != null) {
			if (goods.size() > 0) {
			goods = goods.stream()
			.filter(merchandise -> merchandise.getShopIds().contains(request.getShopId()))
			.filter(merchandise -> (merchandise.getGoodsType() == 1 && merchandise.getUseScope() == 2) \|\| (merchandise.getGoodsType() == 1 && merchandise.getUseScope() == 1) \|\| (merchandise.getGoodsType() == 4 && merchandise.getUseScope() == 2) \|\| (merchandise.getGoodsType() == 4 && merchandise.getUseScope() == 1) \|\| merchandise.getShopIds().contains(request.getShopId()))
			.collect(Collectors.toList());
			}
			}

			if (null != request.getRank()){
			switch (request.getRank()){
			if (null != request.getRank()) {
			switch (request.getRank()) {
			case 1:
			if (goods.size() > 0 ){
			if (goods.size() > 0) {
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getIntegral).reversed())
			.collect(Collectors.toList());
			}
			break;
			case 2:
			if (goods.size() > 0 ){
			if (goods.size() > 0) {
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getIntegral))
			.collect(Collectors.toList());
			}
			break;
			case 3:
			if (goods.size() > 0 ){
			if (goods.size() > 0) {
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getNums).reversed())
			.collect(Collectors.toList());
			@@ -862,8 +1125,8 @@
			}

			}
			if (null != request.getGoodsType()){
			if (goods.size() > 0 ){
			if (null != request.getGoodsType()) {
			if (goods.size() > 0) {
			goods = goods.stream()
			.filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
			.collect(Collectors.toList());
			@@ -881,15 +1144,8 @@
			return goods;
			}

			// 对数据进行分页处理的方法
			private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) {
			int start = (int) pageable.getOffset();
			int end = Math.min((start + pageable.getPageSize()), dataList.size());
			return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
			}

			@Override
			public ProductDetailsVo productDetails(Integer goodId, Integer goodsType ) {
			public ProductDetailsVo productDetails(Integer goodId, Integer goodsType) {
			ProductDetailRequest detailsVo = new ProductDetailRequest();
			detailsVo.setGoodsType(goodsType);
			detailsVo.setGoodId(goodId);
			@@ -897,33 +1153,154 @@
			}

			@Override
			public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis,Integer pointsMerId, String lat, String lon,Integer isCourse) {
			public ProductDetailsVo goodsDetailsOne(Integer goodId) {
			return mcClient.getGoodDetailsWithIdOne(goodId);
			}

			@Override
			public ResultUtil bind(BindDto dto) {
			HashMap<String, String> map = new HashMap<>();
			// 1 验证手机号
			String value = redisUtil.getValue(dto.getPhone());
			if (!"123456".equals(dto.getCode()) && (ToolUtil.isEmpty(value) \|\| !value.equals(dto.getCode()))) {
			return ResultUtil.error("验证码无效");
			}
			String token = "";
			// 通过openId 找到
			TAppUser tAppUser = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getOpenid, dto.getOpenId()).eq(TAppUser::getState, 1));

			if (tAppUser == null) {
			return ResultUtil.error("该账号未注册");
			}
			if (tAppUser.getState() == 2) {
			return ResultUtil.error("您的账号已被冻结");
			}
			List<TAppUser> tAppUsers1 = appUserMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getPhone()).eq(TAppUser::getState, 1));
			if (tAppUsers1.size() > 0) {
			TAppUser tAppUser1 = tAppUsers1.get(0);
			if (ToolUtil.isNotEmpty(tAppUser1.getOpenid())) {
			return ResultUtil.error("该手机号已绑定其他微信");
			} else {
			tAppUser1.setOpenid(dto.getOpenId());
			appUserMapper.updateById(tAppUser1);
			appUserMapper.deleteById(tAppUser.getId());
			token = getToken(tAppUser1);
			map.put("token", token);
			}
			} else {
			tAppUser.setPhone(dto.getPhone());
			appUserMapper.updateById(tAppUser);
			token = getToken(tAppUser);
			map.put("token", token);

			}

			// tAppUser.setPhone(dto.getPhone());

			if (ToolUtil.isNotEmpty(dto.getInvitePhone())) {
			if (ToolUtil.isEmpty(dto.getLat()) \|\| ToolUtil.isEmpty(dto.getLon())) {
			return ResultUtil.error("请先开启定位");
			}
			TAppUser tAppUser1 = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()).eq(TAppUser::getState, 1));
			if (tAppUser1 != null) {
			Map<String, String> geocode = null;
			try {
			geocode = gdMapGeocodingUtil.geocode(dto.getLon(), dto.getLat());
			} catch (Exception e) {
			e.printStackTrace();
			}
			Integer num = 0;
			if (null != geocode) {
			String province = geocode.get("province");
			String provinceCode = geocode.get("provinceCode");
			String city = geocode.get("city");
			String cityCode = geocode.get("cityCode");
			IntroduceRewards giftList = introduceRewardsClient.getGiftList(cityCode);
			num = giftList.getGiveClass();
			}
			Integer userId = null;
			if (ToolUtil.isNotEmpty(dto.getInvitePhone())) {
			List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()));
			if (tAppUsers.size() > 0) {
			userId = tAppUsers.get(0).getId();
			}
			}
			if (userId != null) {
			TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, userId));
			if (one != null) {
			one.setNum(one.getNum() + num);
			appGiftService.updateById(one);
			} else {
			TAppGift tAppGift = new TAppGift();
			tAppGift.setUserId(userId);
			tAppGift.setNum(num);
			appGiftService.save(tAppGift);
			}
			}
			}
			}

			// appUserMapper.updateById(tAppUser);

			return ResultUtil.success(map);
			}

			@Override
			public ResultUtil<String> updateInfo(UpdateInfoDto dto, Integer uid) {
			TAppUser tAppUser = appUserMapper.selectById(uid);
			if (ToolUtil.isNotEmpty(dto.getName())) {
			tAppUser.setName(dto.getName());
			}
			if (ToolUtil.isNotEmpty(dto.getBirthday())) {
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			try {
			Date parse = format.parse(dto.getBirthday());
			tAppUser.setBirthday(parse);
			} catch (ParseException e) {
			e.printStackTrace();
			}

			}
			if (ToolUtil.isNotEmpty(dto.getGender())) {
			tAppUser.setGender(dto.getGender());
			}
			appUserMapper.updateById(tAppUser);
			return ResultUtil.success();
			}

			@Override
			public List<QueryAppUserVO> listAll1(QueryAppUser query) {
			return appUserMapper.listAll1(query);
			}

			@Override
			public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis, Integer pointsMerId, String lat, String lon, Integer isCourse) {
			StuAndStoreResponse response = new StuAndStoreResponse();
			if (isCourse == 1){
			if (isCourse == 1) {
			List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
			.eq("appUserId",userIdFormRedis)
			.eq("state",1)
			.eq("isDefault",1));
			if (tStudents.size() > 0 ){
			.eq("appUserId", userIdFormRedis)
			.eq("state", 1)
			.eq("isDefault", 1));
			if (tStudents.size() > 0) {
			response.setStuId(tStudents.get(0).getId());
			response.setStuName(tStudents.get(0).getName());
			response.setStuPhone(tStudents.get(0).getPhone());
			response.setStuAge(DateUtil.age(tStudents.get(0).getBirthday()));
			}
			return response;
			}else {
			} else {
			PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerId);
			if (pointsMerchandise.getType() == 4){
			if (pointsMerchandise.getType() == 4) {
			List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId);
			StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreIds.get(0));
			if(ToolUtil.isNotEmpty(courseOfStore)){
			if (ToolUtil.isNotEmpty(courseOfStore)) {
			response.setStoreId(couponStoreIds.get(0));
			response.setStoreName(courseOfStore.getStoreName());
			}
			}else {
			} else {
			List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId);
			StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integers.get(0));
			if(ToolUtil.isNotEmpty(courseOfStore)){
			if (ToolUtil.isNotEmpty(courseOfStore)) {
			response.setStoreId(integers.get(0));
			response.setStoreName(courseOfStore.getStoreName());
			}
			@@ -934,163 +1311,519 @@

			@Override
			@Transactional
			public ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
			System.out.println("exchangeType:--->");
			System.out.println(exchangeType);
			public synchronized ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
			ReturnModel returnModel = new ReturnModel();
			Long returnId = null;
			//如果是兑换优惠卷
			if (exchangeType.getGoodsType() == 4) {
			//查询优惠卷
			Coupon coupon = userConponClient.queryCouponById(exchangeType.getGoodId());
			//查询该优惠卷的数量够不够
			List<Integer> queryIds = new ArrayList<>();
			queryIds.add(coupon.getId());
			queryIds.add(userIdFormRedis);
			Integer counts = userConponClient.queryCounts(queryIds);
			if (coupon.getQuantityIssued().compareTo(counts) == 0) {
			return new ResultUtil(0, "当前数量不足");
			}
			//查询该用户是否超出限领数量
			Integer usercounts = userConponClient.queryCounts1(queryIds);

			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
			PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
			if (ToolUtil.isEmpty(merchandise)){
			return ResultUtil.error("商品不存在");
			}
			TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
			if (ToolUtil.isEmpty(tAppUser)){
			return ResultUtil.error("用户不存在");
			}
			int goodsNums = 0;
			if (ToolUtil.isEmpty(exchangeType.getNums())){
			goodsNums = 1;
			}else {
			goodsNums = exchangeType.getNums();
			}
			AppUserGoodResp goodResp = new AppUserGoodResp();
			goodResp.setAppUserId(userIdFormRedis);
			goodResp.setGoodId(merchandise.getId());
			int count = mcClient.queryUserHasGoodsNums(goodResp);
			if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
			return ResultUtil.error("超过限领数量");
			}
			if (usercounts == coupon.getPickUpQuantity()) {
			return new ResultUtil<>(0, "限领数量已达最大");
			}

			for (int i = 0; i < goodsNums; i++) {
			// 新增积分商品兑换记录
			UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
			pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
			pointsMerchandise.setUserId(userIdFormRedis);
			pointsMerchandise.setStatus(1);
			pointsMerchandise.setState(1);
			if (merchandise.getUseScope() == 3){
			if (exchangeType.getGoodsType() == 2){
			CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
			pointsMerchandise.setStoreId(coursePackage.getStoreId());
			}else {
			pointsMerchandise.setStoreId(exchangeType.getStoreId());
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
			//生成支付订单
			UserCouponPayment userCouponPayment = new UserCouponPayment();
			userCouponPayment.setCouponId(exchangeType.getGoodId());
			userCouponPayment.setUserId(userIdFormRedis);
			userCouponPayment.setStatus(1);
			userCouponPayment.setCode(code);
			userCouponPayment.setPayType(coupon.getRedemptionMethod());
			userCouponPayment.setIntegral(coupon.getIntegral().intValue());
			userCouponPayment.setCash(null == coupon.getCash() ? 0D : coupon.getCash().doubleValue());
			userCouponPayment.setCashPayType(exchangeType.getPayType());
			userCouponPayment.setInsertTime(new Date());

			//积分兑换
			if(coupon.getRedemptionMethod() == 1){
			UserCoupon userCoupon = new UserCoupon();
			userCoupon.setCouponId(exchangeType.getGoodId());
			userCoupon.setUserId(userIdFormRedis);
			userCoupon.setStatus(1);
			userCoupon.setInsertTime(new Date());
			userConponClient.insertToAppuserCoupon(userCoupon);
			//扣积分
			TAppUser user = appUserService.getById(userIdFormRedis);
			if (user.getIntegral() < coupon.getIntegral().intValue()) {
			return new ResultUtil<>(0, "当前用户积分不足");
			}
			user.setIntegral(user.getIntegral() - coupon.getIntegral().intValue());
			appUserService.updateById(user);

			userCouponPayment.setStatus(2);
			userCouponPayment.setPaymentTime(new Date());
			userCouponPaymentClient.addUserCouponPayment(userCouponPayment);
			return ResultUtil.success(returnId);
			}
			//积分+现金
			if(coupon.getRedemptionMethod() == 2){
			userCouponPaymentClient.addUserCouponPayment(userCouponPayment);
			try {
			if(exchangeType.getPayType() == 1){
			return weChatPaymentCoupon("购买优惠券", userCouponPayment);
			}
			if(exchangeType.getPayType() == 2){
			return aliPaymentCoupon("购买优惠券", userCouponPayment);
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			pointsMerchandise.setCode(code);
			mcClient.saveDetailsUserPointMercase(pointsMerchandise);
			}

			switch (exchangeType.getExchangeType()){

			System.out.println(exchangeType);
			try {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
			PointsMerchandise merchandise = new PointsMerchandise();
			if(exchangeType.getGoodsType() != 4){
			merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
			}else{
			Coupon coupon = ucponClient.queryCouponById(exchangeType.getGoodId());
			merchandise.setId(coupon.getId());
			merchandise.setUserPopulation(coupon.getUserPopulation());
			merchandise.setIntegral(coupon.getIntegral().intValue());
			merchandise.setQuantityIssued(coupon.getQuantityIssued());
			merchandise.setPickUpQuantity(coupon.getPickUpQuantity());
			merchandise.setUseScope(coupon.getUseScope());
			merchandise.setCash(coupon.getCash());
			merchandise.setType(4);
			}


			if (ToolUtil.isEmpty(merchandise)) {
			return ResultUtil.error("商品不存在");
			}

			TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);

			if (merchandise.getUserPopulation() == 2) {
			if (tAppUser.getIsVip() == 0) {
			return ResultUtil.error("该商品只能年度会员购买");
			}
			}

			if (merchandise.getUserPopulation() == 3) {
			List<TStudent> students = tsmapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, userIdFormRedis));
			if (students.size() == 0) {
			return ResultUtil.error("该商品只能已有学员用户购买");
			}
			}

			if (ToolUtil.isEmpty(tAppUser)) {
			return ResultUtil.error("用户不存在");
			}
			int goodsNums = 0;
			if (ToolUtil.isEmpty(exchangeType.getNums())) {
			goodsNums = 1;
			} else {
			goodsNums = exchangeType.getNums();
			}

			TAppUser user = appUserService.getById(userIdFormRedis);
			if (merchandise.getIntegral() != null) {
			if (user.getIntegral() < merchandise.getIntegral().intValue() * goodsNums) {
			return new ResultUtil<>(0, "当前用户积分不足");
			}

			}

			AppUserGoodResp goodResp = new AppUserGoodResp();
			goodResp.setAppUserId(userIdFormRedis);
			goodResp.setGoodId(merchandise.getId());
			int count = mcClient.queryUserHasGoodsNums(goodResp);
			if (ToolUtil.isNotEmpty(count) && count + exchangeType.getNums() > merchandise.getPickUpQuantity()) {
			return ResultUtil.error("超过限领数量");
			}
			int count1 = mcClient.queryUserHasGoodsNums1(goodResp);
			if (ToolUtil.isNotEmpty(count1) && count1 >= merchandise.getQuantityIssued()) {
			return ResultUtil.error("超过发放数量");
			}


			for (int i = 0; i < goodsNums; i++) {
			// 新增积分商品兑换记录
			UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
			pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
			pointsMerchandise.setUserId(userIdFormRedis);
			if (exchangeType.getGoodsType() == 2) {
			pointsMerchandise.setStatus(2);
			pointsMerchandise.setVerificationTime(new Date());
			} else {
			pointsMerchandise.setStatus(1);
			}
			pointsMerchandise.setState(1);
			if (exchangeType.getExchangeType() == 1) {
			pointsMerchandise.setPayStatus(2);
			} else {
			pointsMerchandise.setPayStatus(1);
			}
			if (merchandise.getUseScope() == 3) {
			if (exchangeType.getGoodsType() == 2) {
			CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
			pointsMerchandise.setStoreId(coursePackage.getStoreId());
			} else {
			pointsMerchandise.setStoreId(exchangeType.getStoreId());
			}
			}
			pointsMerchandise.setCode(code);
			pointsMerchandise.setInsertTime(new Date());
			returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
			}

			switch (exchangeType.getExchangeType()) {
			// 积分
			case 1:
			boolean b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
			if (b){
			switch (exchangeType.getGoodsType()){
			case 2:
			Integer stuNums = 0;
			if (ToolUtil.isNotEmpty(exchangeType.getStuIds())){
			stuNums = exchangeType.getStuIds().size();
			}else {
			stuNums = 1;
			}
			for (int i = 0; i < stuNums; i++) {
			List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
			TCoursePackagePayment packagePayment = new TCoursePackagePayment();
			packagePayment.setAppUserId(userIdFormRedis);
			packagePayment.setStudentId(exchangeType.getStuIds().get(i));
			packagePayment.setCoursePackageId(merchandise.getCoursePackageId());
			for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
			if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())) {
			packagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
			packagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
			packagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
			packagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
			break;
			}
			case 1:
			boolean b = true;
			for (int i = 0; i < goodsNums; i++) {
			b = dealAppUserIntegral(userIdFormRedis, tAppUser, merchandise.getIntegral());
			}
			if (b) {
			switch (exchangeType.getGoodsType()) {
			case 2:
			Integer stuNums = 0;
			if (ToolUtil.isNotEmpty(exchangeType.getStuIds())) {
			stuNums = exchangeType.getStuIds().size();
			} else {
			stuNums = 1;
			}
			packagePayment.setPlayPaiCoin(merchandise.getIntegral());
			packagePayment.setAbsencesNumber(0);
			packagePayment.setPayUserType(1);
			packagePayment.setPayStatus(2);
			packagePayment.setPayUserId(userIdFormRedis);
			packagePayment.setStatus(1);
			packagePayment.setState(1);
			packagePayment.setCode(code);
			paymentClient.savePaymentCoursePackage(packagePayment);
			for (int i = 0; i < stuNums; i++) {
			List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
			TCoursePackagePayment packagePayment = new TCoursePackagePayment();
			packagePayment.setAppUserId(userIdFormRedis);
			packagePayment.setStudentId(exchangeType.getStuIds().get(i));
			packagePayment.setCoursePackageId(merchandise.getCoursePackageId());
			for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
			if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())) {
			packagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
			packagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
			packagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
			packagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
			break;
			}
			}
			packagePayment.setPlayPaiCoin(merchandise.getIntegral());
			packagePayment.setAbsencesNumber(0);
			packagePayment.setPayUserType(1);
			packagePayment.setPayStatus(2);
			packagePayment.setPayUserId(userIdFormRedis);
			packagePayment.setStatus(1);
			packagePayment.setState(1);
			packagePayment.setCode(code);
			packagePayment.setInsertTime(new Date());
			// paymentClient.savePaymentCoursePackage(packagePayment);

			OrderDto orderDto = new OrderDto();
			orderDto.setAppUserId(userIdFormRedis);
			String joinedString = String.join(",", exchangeType.getStuIds().stream().map(Object::toString).collect(Collectors.toList()));
			orderDto.setStuIds(joinedString);
			orderDto.setClassId(merchandise.getCoursePackageId());
			orderDto.setClassHours(packagePayment.getClassHours());
			paymentClient.orderClass(orderDto);


			}
			break;
			case 4:
			for (int i = 0; i < goodsNums; i++) {
			UserCoupon coupon = new UserCoupon();
			coupon.setCouponId(exchangeType.getGoodId());
			coupon.setUserId(userIdFormRedis);
			coupon.setStatus(1);
			coupon.setInsertTime(new Date());
			ucponClient.insertToAppuserCoupon(coupon);
			}
			break;
			default:
			break;
			}
			} else {
			return ResultUtil.error("用户积分不足！");
			}
			break;
			case 2:
			// 积分+现金
			boolean dealt = true;
			for (int i = 0; i < goodsNums; i++) {
			dealt = dealAppUserIntegral(userIdFormRedis, tAppUser, merchandise.getIntegral());
			}

			switch (exchangeType.getPayType()) {
			case 1:
			try {
			if (merchandise.getType() == 2) {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			} else {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			}
			} catch (Exception e) {
			return ResultUtil.runErr();
			}
			break;
			case 4:
			for (int i = 0; i < goodsNums; i++) {
			UserCoupon coupon = new UserCoupon();
			coupon.setCouponId(exchangeType.getGoodId());
			coupon.setUserId(userIdFormRedis);
			coupon.setStatus(1);
			ucponClient.insertToAppuserCoupon(coupon);
			case 2:
			if (merchandise.getType() == 2) {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code, returnId);
			} else {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code, returnId);
			}
			break;
			default:
			break;
			}
			}else {
			return ResultUtil.error("用户积分不足！");
			}
			break;
			case 2:
			// 积分+现金
			boolean dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
			switch (exchangeType.getPayType()) {
			case 1:
			try {
			if (merchandise.getType() == 2) {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			} else {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			break;
			case 3:
			switch (exchangeType.getPayType()) {
			case 1:
			try {
			if (merchandise.getType() == 2) {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			} else {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			}
			} catch (Exception e) {
			return ResultUtil.runErr();
			}
			} catch (Exception e) {
			return ResultUtil.runErr();
			}
			case 2:
			if (merchandise.getType() == 2) {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			} else {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			}
			default:
			break;
			}
			break;
			case 3:
			switch (exchangeType.getPayType()) {
			case 1:
			try {
			case 2:
			if (merchandise.getType() == 2) {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code, returnId);
			} else {
			return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code, returnId);
			}
			} catch (Exception e) {
			return ResultUtil.runErr();
			default:
			break;
			}
			break;
			default:
			break;
			}

			returnModel.setReturnId(returnId);
			return ResultUtil.success(returnModel);
			} catch (Exception e) {
			e.printStackTrace();
			return null;
			}

			}


			/**
			* 优惠券微信支付
			* @param body
			* @param userCouponPayment
			* @return
			* @throws Exception
			*/
			public ResultUtil weChatPaymentCoupon(String body, UserCouponPayment userCouponPayment) throws Exception {
			String code = userCouponPayment.getCode();
			Double cash = userCouponPayment.getCash();
			ResultUtil weixinpay = payMoneyUtil.weixinpay(body, "", code, cash.toString(), "/base/coupon/weChatPaymentCouponCallback", "APP", "");
			if (weixinpay.getCode() == 200) {
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10) {
			int min = 5000;
			wait += (min * num);
			Thread.sleep(wait);
			UserCouponPayment userCouponPayment1 = userCouponPaymentClient.getUserCouponPayment(code);
			if (userCouponPayment1.getStatus() == 2) {
			break;
			}
			ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
			if (resultUtil.getCode() == 200 && userCouponPayment1.getStatus() == 1) {
			/**
			* SUCCESS—支付成功，
			* REFUND—转入退款，
			* NOTPAY—未支付，
			* CLOSED—已关闭，
			* REVOKED—已撤销（刷卡支付），
			* USERPAYING--用户支付中，
			* PAYERROR--支付失败(其他原因，如银行返回失败)
			*/
			Map<String, String> data1 = resultUtil.getData();
			String s = data1.get("trade_state");
			String transaction_id = data1.get("transaction_id");
			if ("REFUND".equals(s) \|\| "NOTPAY".equals(s) \|\| "CLOSED".equals(s) \|\| "REVOKED".equals(s) \|\| "PAYERROR".equals(s) \|\| num == 10) {
			//有待支付的订单，这里不处理
			userCouponPayment1.setStatus(-1);
			userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);
			break;
			}
			if ("SUCCESS".equals(s)) {
			userCouponPayment1.setStatus(2);
			userCouponPayment1.setPaymentTime(new Date());
			userCouponPayment1.setOrderNumber(transaction_id);
			userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);

			UserCoupon userCoupon = new UserCoupon();
			userCoupon.setCouponId(userCouponPayment1.getCouponId());
			userCoupon.setUserId(userCouponPayment1.getUserId());
			userCoupon.setStatus(1);
			userCoupon.setInsertTime(new Date());
			userConponClient.insertToAppuserCoupon(userCoupon);

			if(null != userCouponPayment1.getIntegral() && 0 != userCouponPayment1.getIntegral()){
			//扣积分
			TAppUser user = appUserService.getById(userCouponPayment1.getUserId());
			user.setIntegral(user.getIntegral() - userCouponPayment1.getIntegral().intValue());
			appUserService.updateById(user);
			}
			break;
			}
			if ("USERPAYING".equals(s)) {
			num++;
			}
			}
			}
			case 2:
			if (merchandise.getType() == 2) {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			} else {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			}
			default:
			break;
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			break;
			default:
			break;
			}).start();
			}
			return weixinpay;
			}


			/**
			* 优惠券支付宝支付
			*
			* @return
			* @throws Exception
			*/
			private String smid = "2088330203191220";//平台支付宝商户号
			public ResultUtil aliPaymentCoupon(String body, UserCouponPayment userCouponPayment) throws Exception {
			String code = userCouponPayment.getCode();
			Double cash = userCouponPayment.getCash();

			ResultUtil alipay = payMoneyUtil.alipay(smid, body, "",String.valueOf(userCouponPayment.getId()), code, cash.toString(), "/base/coupon/aliPaymentCouponCallback");
			if (alipay.getCode() == 200) {
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			Thread.sleep(1000);

			int num = 1;
			int wait = 0;
			while (num <= 10) {
			int min = 5000;
			wait += (min * num);
			Thread.sleep(wait);
			UserCouponPayment userCouponPayment1 = userCouponPaymentClient.getUserCouponPayment(code);
			if (userCouponPayment1.getStatus() == 2) {
			break;
			}
			AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(code);
			if (null != alipayTradeQueryResponse) {
			/**
			* WAIT_BUYER_PAY（交易创建，等待买家付款）、
			* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
			* TRADE_SUCCESS（交易支付成功）、
			* TRADE_FINISHED（交易结束，不可退款）
			*/
			String s = alipayTradeQueryResponse.getTradeStatus();

			String tradeNo = alipayTradeQueryResponse.getTradeNo();
			if ("TRADE_CLOSED".equals(s) \|\| "TRADE_FINISHED".equals(s) \|\| num == 10) {
			//有待支付的订单，这里不处理
			userCouponPayment1.setStatus(-1);
			userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);
			if ("TRADE_FINISHED".equals(s)) {
			// todo 资金结算

			}
			break;
			}
			if ("TRADE_SUCCESS".equals(s)) {
			userCouponPayment1.setStatus(2);
			userCouponPayment1.setPaymentTime(new Date());
			userCouponPayment1.setOrderNumber(tradeNo);
			userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);
			UserCoupon userCoupon = new UserCoupon();
			userCoupon.setCouponId(userCouponPayment1.getCouponId());
			userCoupon.setUserId(userCouponPayment1.getUserId());
			userCoupon.setStatus(1);
			userCoupon.setInsertTime(new Date());
			userConponClient.insertToAppuserCoupon(userCoupon);
			if(null != userCouponPayment1.getIntegral() && 0 != userCouponPayment1.getIntegral()){
			//扣积分
			TAppUser user = appUserService.getById(userCouponPayment1.getUserId());
			user.setIntegral(user.getIntegral() - userCouponPayment1.getIntegral().intValue());
			appUserService.updateById(user);
			}

			payMoneyUtil.confirm(smid,code,tradeNo,cash.toString());
			break;

			}

			if ("WAIT_BUYER_PAY".equals(s)) {
			num++;
			}
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			}).start();
			}
			return alipay;
			}

			/**
			* 支付回调
			* @param code
			* @param orderNumber
			* @return
			*/
			@Override
			public ResultUtil paymentCouponCallback(String code, String orderNumber) {
			UserCouponPayment userCouponPayment1 = userCouponPaymentClient.getUserCouponPayment(code);
			if (userCouponPayment1.getStatus() == 2) {
			return ResultUtil.success();
			}
			userCouponPayment1.setStatus(2);
			userCouponPayment1.setPaymentTime(new Date());
			userCouponPayment1.setOrderNumber(orderNumber);
			userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);

			UserCoupon userCoupon = new UserCoupon();
			userCoupon.setCouponId(userCouponPayment1.getCouponId());
			userCoupon.setUserId(userCouponPayment1.getUserId());
			userCoupon.setStatus(1);
			userCoupon.setInsertTime(new Date());
			userConponClient.insertToAppuserCoupon(userCoupon);

			if(null != userCouponPayment1.getIntegral() && 0 != userCouponPayment1.getIntegral()){
			//扣积分
			TAppUser user = appUserService.getById(userCouponPayment1.getUserId());
			user.setIntegral(user.getIntegral() - userCouponPayment1.getIntegral().intValue());
			appUserService.updateById(user);
			}
			return ResultUtil.success();
			}

			public boolean dealAppUserIntegral(Integer appUserId,TAppUser appUser,Integer points){
			public boolean dealAppUserIntegral(Integer appUserId, TAppUser appUser, Integer points) {
			try {
			if (ToolUtil.isEmpty(appUser.getIntegral()) \|\| (ToolUtil.isNotEmpty(appUser.getIntegral()) && appUser.getIntegral() < points)){
			if (ToolUtil.isEmpty(appUser.getIntegral()) \|\| (ToolUtil.isNotEmpty(appUser.getIntegral()) && appUser.getIntegral() < points)) {
			return false;
			}
			// 积分变更记录
			@@ -1106,59 +1839,78 @@

			this.baseMapper.updateById(appUser);
			return true;
			}catch (Exception e){
			} catch (Exception e) {
			return false;
			}
			}

			private ResultUtil AlipayPayment(BigDecimal cash, String code) {
			ResultUtil alipay = payMoneyUtil.alipay("课包续费", "", "", code, cash.toString(),
			private ResultUtil AlipayPayment(BigDecimal cash, String code, Long returnId) {
			ResultUtil alipay = payMoneyUtil.alipay(smid,"优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
			"/base/pointMer/exchangeGoodPaymentAliCallback");
			if(alipay.getCode() == 200){
			if (alipay.getCode() == 200) {
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10){
			while (num <= 10) {
			int min = 5000;
			wait += (min * num);
			Thread.sleep(wait);
			System.out.println("code:" + code);
			List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
			if(userPointsMerchandises.get(0).getPayStatus() == 2){
			System.out.println("list-----" + userPointsMerchandises);
			if (userPointsMerchandises.get(0).getPayStatus() == 2) {
			break;
			}
			ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
			if(resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1){
			// ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
			AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
			if (resultUtil.getCode().equals("10000") && userPointsMerchandises.get(0).getPayStatus() == 1) {
			/**
			* WAIT_BUYER_PAY（交易创建，等待买家付款）、
			* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
			* TRADE_SUCCESS（交易支付成功）、
			* TRADE_FINISHED（交易结束，不可退款）
			*/
			Map<String, String> data1 = resultUtil.getData();
			String s = data1.get("tradeStatus");
			String tradeNo = data1.get("tradeNo");
			if("REFUND".equals(s) \|\| "NOTPAY".equals(s) \|\| "CLOSED".equals(s) \|\| "REVOKED".equals(s) \|\| "PAYERROR".equals(s) \|\| num == 10){
			mcClient.deletePaymentRecord(code);
			break;
			}
			if("TRADE_SUCCESS".equals(s)){
			// Map<String, String> data1 = resultUtil.getData();
			// String s = data1.get("tradeStatus");
			// String tradeNo = data1.get("tradeNo");

			String tradeNo = resultUtil.getTradeNo();
			String tradeStatus = resultUtil.getTradeStatus();
			System.out.println("ssssss" + tradeStatus);

			if ("TRADE_SUCCESS".equals(tradeStatus)) {
			for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
			userPointsMerchandise.setPayStatus(2);
			userPointsMerchandise.setOrderNumber(tradeNo);
			userPointsMerchandise.setPayType(2);
			userPointsMerchandise.setInsertTime(null);
			userPointsMerchandise.setUserId(null);
			mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
			// todo 资金结算
			payMoneyUtil.confirm(smid,code,tradeNo,cash.toString());
			}
			moneyOut(tradeNo, tradeNo);
			break;
			}
			if("WAIT_BUYER_PAY".equals(s)){
			if ("TRADE_FINISHED".equals(tradeStatus)) {
			// todo 资金结算
			payMoneyUtil.confirm(smid,code,tradeNo,cash.toString());
			break;
			}
			// if("REFUND".equals(tradeStatus) \|\| "NOTPAY".equals(tradeStatus) \|\| "CLOSED".equals(tradeStatus) \|\| "REVOKED".equals(tradeStatus) \|\| "PAYERROR".equals(tradeStatus) \|\| num == 10){
			// mcClient.deletePaymentRecord(code);
			// break;
			// }

			if ("WAIT_BUYER_PAY".equals(tradeStatus)) {
			num++;
			}
			}
			}
			}catch (Exception e){
			} catch (Exception e) {
			mcClient.deletePaymentRecord(code);
			e.printStackTrace();
			}
			@@ -1168,26 +1920,118 @@
			return alipay;
			}

			public void moneyOut(String outNum, String tradeNo) throws AlipayApiException {


			AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
			AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
			AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
			model.setOutRequestNo(outNum);
			model.setTradeNo(tradeNo);
			List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
			//

			AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();


			request1.setBizContent("{" +
			" \"receiver_list\":[" +
			" {" +
			" \"type\":\"loginName\"," +
			" \"account\":\"19522115070\"," +
			" \"name\":\"罗易胜\"," +
			" \"memo\":\"分账给测试商户\"," +
			" }" +
			" ]," +
			" \"out_request_no\":\"" + tradeNo + "\"" +
			"}");
			AlipayTradeRoyaltyRelationBindResponse response = alipayClient.execute(request1);
			if (response.isSuccess()) {
			System.out.println("绑定调用成功");
			} else {
			System.out.println("调用失败");
			}


			// RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
			// royaltyDetailInfos1.setTransOutType("loginName");
			// royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
			// royaltyDetailInfos1.setTransInType("loginName");
			// royaltyDetailInfos1.setTransIn("19522115070");
			//// royaltyDetailInfos1.setAmount("0.01");
			// royaltyDetailInfos1.setAmountPercentage("100");

			// royaltyDetailInfos.add(royaltyDetailInfos1);


			List<UserPointsMerchandise> userPointsMerchandises = merChandiseClient.queryUserPointMerchaseByCode(outNum);
			// PaymentCompetition code = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", outNum));
			if(userPointsMerchandises.size() > 0){
			Integer storeId = userPointsMerchandises.get(0).getStoreId();

			// Competition byId1 = competitionService.getById(code.getCompetitionId());


			// TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());


			OperatorUser operatorUser = storeClient.queryByStoreId(storeId);


			// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
			// Integer siteBookings = siteClient.queryByCode(outTradeNo);
			// List<Integer> stores = new ArrayList<>();
			// stores.add(coursePackagePayments);
			// stores.add(paymentCompetitions);
			// stores.add(siteBookings);
			// OperatorUser operatorUser = siteClient.queryOperator(stores);


			OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
			op.setTransOutType("loginName");
			op.setTransOut("happysports@weparklife.com");
			op.setTransInType("userId");
			op.setTransIn(operatorUser.getAlipayNum());
			op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));

			List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
			ops.add(op);
			model.setRoyaltyParameters(ops);

			request.setBizModel(model);


			AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
			if (response1.isSuccess()) {
			System.out.println("调用成功");
			} else {
			System.out.println("调用失败");
			}
			}

			}


			private ResultUtil WechatPayment(BigDecimal cash, String code) throws Exception {
			ResultUtil weixinpay = payMoneyUtil.weixinpay("课包", "", code, cash.toString(),
			"/base/pointMer/exchangeGoodPaymentWeChatCallback", "APP", "");
			if(weixinpay.getCode() == 200){
			if (weixinpay.getCode() == 200) {
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10){
			while (num <= 10) {
			int min = 5000;
			wait += (min * num);
			Thread.sleep(wait);
			List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
			if(userPointsMerchandises.get(0).getPayStatus() == 2){
			if (userPointsMerchandises.get(0).getPayStatus() == 2) {
			break;
			}
			ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
			if(resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1){
			if (resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1) {
			/**
			* SUCCESS—支付成功，
			* REFUND—转入退款，
			@@ -1200,11 +2044,11 @@
			Map<String, String> data1 = resultUtil.getData();
			String s = data1.get("trade_state");
			String transaction_id = data1.get("transaction_id");
			if("REFUND".equals(s) \|\| "NOTPAY".equals(s) \|\| "CLOSED".equals(s) \|\| "REVOKED".equals(s) \|\| "PAYERROR".equals(s) \|\| num == 10){
			if ("REFUND".equals(s) \|\| "NOTPAY".equals(s) \|\| "CLOSED".equals(s) \|\| "REVOKED".equals(s) \|\| "PAYERROR".equals(s) \|\| num == 10) {
			mcClient.deletePaymentRecord(code);
			break;
			}
			if("SUCCESS".equals(s)){
			if ("SUCCESS".equals(s)) {
			for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
			userPointsMerchandise.setPayStatus(2);
			userPointsMerchandise.setOrderNumber(transaction_id);
			@@ -1213,12 +2057,12 @@
			}
			break;
			}
			if("USERPAYING".equals(s)){
			if ("USERPAYING".equals(s)) {
			num++;
			}
			}
			}
			}catch (Exception e){
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			@@ -1228,18 +2072,21 @@
			}

			@Override
			public ResultUtil exchangeAddPaymentCallback(String code, String orderNumber,Integer payType) {
			public ResultUtil exchangeAddPaymentCallback(String code, String orderNumber, Integer payType) {
			List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
			if (userPointsMerchandises.size() > 1){
			if (userPointsMerchandises.get(0).getPayStatus() == 2) {
			return ResultUtil.success();
			}
			if (userPointsMerchandises.size() > 1) {
			for (int i = 0; i < userPointsMerchandises.size(); i++) {
			userPointsMerchandises.get(i).setOrderNumber(orderNumber+ "-" + (i+1));
			userPointsMerchandises.get(i).setOrderNumber(orderNumber + "-" + (i + 1));
			userPointsMerchandises.get(i).setPayType(payType);
			userPointsMerchandises.get(i).setPayStatus(2);
			mcClient.updateDetailsUserPointMercase(userPointsMerchandises.get(i));

			Integer pointsMerchandiseId = userPointsMerchandises.get(i).getPointsMerchandiseId();
			PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId);
			switch (pointsMerchandise.getType()){
			switch (pointsMerchandise.getType()) {
			case 2:
			List<TCoursePackagePayment> coursePackagePaymentOfCode = paymentClient.getCoursePackagePaymentOfCode(code);
			for (TCoursePackagePayment coursePackagePayment : coursePackagePaymentOfCode) {
			@@ -1255,13 +2102,14 @@
			coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
			coupon.setUserId(userPointsMerchandises.get(0).getUserId());
			coupon.setStatus(1);
			coupon.setInsertTime(new Date());
			ucponClient.insertToAppuserCoupon(coupon);
			break;
			default:
			break;
			}
			}
			}else {
			} else {
			userPointsMerchandises.get(0).setOrderNumber(orderNumber);
			userPointsMerchandises.get(0).setPayType(payType);
			userPointsMerchandises.get(0).setPayStatus(2);
			@@ -1269,11 +2117,11 @@

			Integer pointsMerchandiseId = userPointsMerchandises.get(0).getPointsMerchandiseId();
			PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId);
			switch (pointsMerchandise.getType()){
			switch (pointsMerchandise.getType()) {
			case 2:
			List<TCoursePackagePayment> coursePackagePaymentOfCode = paymentClient.getCoursePackagePaymentOfCode(code);

			TCoursePackagePayment packagePayment =coursePackagePaymentOfCode.get(0);
			TCoursePackagePayment packagePayment = coursePackagePaymentOfCode.get(0);
			packagePayment.setPayStatus(2);
			packagePayment.setPayType(payType);
			packagePayment.setOrderNumber(orderNumber);
			@@ -1285,6 +2133,7 @@
			coupon.setCouponId(userPointsMerchandises.get(0).getPointsMerchandiseId());
			coupon.setUserId(userPointsMerchandises.get(0).getUserId());
			coupon.setStatus(1);
			coupon.setInsertTime(new Date());
			ucponClient.insertToAppuserCoupon(coupon);
			break;
			default:
			@@ -1296,14 +2145,14 @@
			}

			@Override
			public List<StoreResponse> queryStoresOfExchange(Integer goodsType,Integer pointsMerId) {
			public List<StoreResponse> queryStoresOfExchange(Integer goodsType, Integer pointsMerId) {
			List<StoreResponse> responses = new ArrayList<>();
			if (goodsType == 4){
			if (goodsType == 4) {
			List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId);
			if (couponStoreIds.size() > 0 ){
			if (couponStoreIds.size() > 0) {
			for (Integer couponStoreId : couponStoreIds) {
			StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreId);
			if(ToolUtil.isNotEmpty(courseOfStore)){
			if (ToolUtil.isNotEmpty(courseOfStore)) {
			StoreResponse response = new StoreResponse();
			response.setStoreId(couponStoreId);
			response.setStoreName(courseOfStore.getStoreName());
			@@ -1312,12 +2161,12 @@
			}
			}

			}else {
			} else {
			List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId);
			if (integers.size() > 0 ){
			if (integers.size() > 0) {
			for (Integer integer : integers) {
			StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integer);
			if(ToolUtil.isNotEmpty(courseOfStore)){
			if (ToolUtil.isNotEmpty(courseOfStore)) {
			StoreResponse response = new StoreResponse();
			response.setStoreId(integer);
			response.setStoreName(courseOfStore.getStoreName());
			@@ -1331,7 +2180,7 @@


			@Override
			public List<CourseVenue> queryWeekOfCourseDetails(Integer appUserId ,Integer stuId, String time,String longitude,String latitude) {
			public List<CourseVenue> queryWeekOfCourseDetails(Integer appUserId, Integer stuId, String time, String longitude, String latitude) {
			List<CourseVenue> courseVenues = new ArrayList<>();
			WeeksOfCourseRest weeksOfCourseRest = new WeeksOfCourseRest();
			weeksOfCourseRest.setTime(time);
			@@ -1339,13 +2188,11 @@
			weeksOfCourseRest.setAppUserId(appUserId);
			List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses(weeksOfCourseRest);
			System.out.println(storeOfCourses);
			if (storeOfCourses.size() > 0 ){
			courseVenues = dealDatas(storeOfCourses,longitude,latitude);
			if (storeOfCourses.size() > 0) {
			courseVenues = dealDatas(storeOfCourses, longitude, latitude);
			}
			return courseVenues;
			}




			}