From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 2418 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 2,251 insertions(+), 167 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 29debd2..02c7717 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1,35 +1,76 @@
 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.entity.TAppUser;
-import com.dsh.account.entity.TStudent;
+import com.dsh.account.dto.*;
+import com.dsh.account.entity.*;
+import com.dsh.account.enums.RechargeRecordEnum;
+import com.dsh.account.feignclient.activity.*;
+import com.dsh.account.feignclient.activity.model.*;
+import com.dsh.account.feignclient.communityWorldCup.WorldCupPaymentClinet;
+import com.dsh.account.feignclient.communityWorldCup.model.GetWorldCupPayment;
+import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
+import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
+import com.dsh.account.feignclient.course.CoursePackageClient;
+import com.dsh.account.feignclient.course.CoursePackageConfigClient;
 import com.dsh.account.feignclient.course.CoursePaymentClient;
-import com.dsh.account.feignclient.course.model.CourseOfStoreVo;
-import com.dsh.account.feignclient.course.model.StuCourseResp;
-import com.dsh.account.feignclient.other.ImgConfigClient;
-import com.dsh.account.feignclient.other.model.TImgConfig;
-import com.dsh.account.mapper.TAppUserMapper;
-import com.dsh.account.mapper.TStudentMapper;
-import com.dsh.account.model.AddAppUserVo;
-import com.dsh.account.model.LoginSMSCodeVo;
-import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.feignclient.course.VideoOfCourseListClient;
+import com.dsh.account.feignclient.course.model.*;
+import com.dsh.account.feignclient.other.*;
+import com.dsh.account.feignclient.other.model.*;
+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.QueryAppUserVO;
 import com.dsh.account.model.vo.classDetails.CourseVenue;
 import com.dsh.account.model.vo.classDetails.ExerciseVideo;
 import com.dsh.account.model.vo.classDetails.RegisteredCourse;
-import com.dsh.account.model.vo.classDetails.WeekedCourse;
 import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
+import com.dsh.account.model.vo.userBenefitDetail.*;
+import com.dsh.account.service.IRefereeService;
+import com.dsh.account.service.TAppGiftService;
 import com.dsh.account.service.TAppUserService;
+import com.dsh.account.service.UserIntegralChangesService;
 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;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,7 +85,7 @@
 public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {
 
 
-    @Autowired
+    @Resource
     private TStudentMapper tsmapper;
 
     @Resource
@@ -62,71 +103,260 @@
     @Autowired
     private JwtTokenUtil jwtTokenUtil;
 
-    @Autowired
+    @Resource
     private CoursePaymentClient paymentClient;
 
+    @Resource
+    private StoreClient storeClient;
+
+    @Resource
+    private MerChandiseClient mcClient;
+
+    @Resource
+    private ImgConfigClient icfgClient;
+
+    @Resource
+    private VideoOfCourseListClient voclClient;
+
+    @Resource
+    private VipPaymentMapper vipPaymentMapper;
+
+    @Resource
+    private RechargeRecordsMapper rrMapper;
+
+    @Resource
+    private RechargeConfigClient reconMapper;
+
+    @Resource
+    private UserConponClient ucponClient;
 
 
+    @Resource
+    private CoursePackageClient cpageClient;
+
+    @Resource
+    private DeductionCompetitionsClient deducClient;
+
+    @Resource
+    private UserIntegralChangesMapper uicMapper;
+
+    @Resource
+    private MerChandiseStoreClient mcsClient;
+
+    @Resource
+    private CoursePackageConfigClient cpconClient;
+
+    @Resource
+    private SiteClient stClient;
+
+    @Resource
+    private TAppUserMapper appUserMapper;
+
+    @Autowired
+    private TAppGiftService appGiftService;
+
+    @Resource
+    private IntroduceRewardsClient introduceRewardsClient;
+
+
+    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;
+
+    @Autowired
+    private IRefereeService refereeService;
+
+    @Resource
+    private WorldCupPaymentClinet worldCupPaymentClinet;
+
+    @Autowired
+    private UserIntegralChangesService userIntegralChangesService;
+
+    @Resource
+    private GameRecordClient gameRecordClient;
+
+
+
+
+
+    // 对数据进行分页处理的方法
+    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 ClassInfoVo queryUserOfStus(Integer id,String latitude,String longitude) {
-        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());
+    public List<QueryAppUserVO> listAll(QueryAppUser query) {
+        return appUserMapper.listAll(query);
+    }
 
-                List<RegisteredCourse> courseList = new ArrayList<>();
-//                总学时数
-                int total = 0;
-//                已扣数
-                int deduct = 0;
-//                剩余数
-                int remain = 0;
-                List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment();
-                if (stuCoursePayment.size() > 0){
-                    for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
-                        RegisteredCourse course = new RegisteredCourse();
-                        course.setCourseId(tCoursePackagePayment.getCourseId());
-                        course.setCourseName(tCoursePackagePayment.getCourseName());
-                        total = total + (ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
-                        deduct = deduct + (ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
-                        remain = remain + (ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
-                        courseList.add(course);
+    @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));
+
+        return map;
+    }
+
+    @Override
+    public List<SelectDto> getSelects(List<Integer> studentIds) {
+        return this.baseMapper.getSelects(studentIds);
+    }
+
+    @Override
+    public Object changeState(AdvertisementChangeStateDTO dto) {
+        return appUserMapper.changeState(dto.getIds(), dto.getState());
+    }
+
+    @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);
+            }
+        }
+        dayUserCount.forEach(dayData -> dayData.setDay(dayData.getDay().split("-")[2]));
+        return dayUserCount.stream().sorted(Comparator.comparing(DayData::getDay)).collect(Collectors.toList());
+    }
 
-                classInfoVo.setTotalNums(total);
-                classInfoVo.setDeductedNums(deduct);
-                classInfoVo.setRemainingNums(remain);
+    @Override
+    public List<GroupCityInfoVO> groupCityInfo(UserInfoQueryDTO dto) {
+        return appUserMapper.groupCityInfo(dto);
+    }
 
-                List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses();
-                classInfoVo.setWeekCourseList(dealDatas(storeOfCourses,longitude,latitude));
+    @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));
 
-                List<ExerciseVideo> videos = new ArrayList<>();
-
-
-                classInfoVo.setExerciseVideoList(videos);
-            }else {
-                classInfoVo.setIsThere(2);
-                List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
-                if (tImgConfigs.size() > 0){
-                    classInfoVo.setImgs(tImgConfigs.get(0).getContent());
+            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;
@@ -134,65 +364,69 @@
 
     /**
      * 处理数据
+     *
      * @param storeOfCourses
      * @param longitude
      * @param latitude
      * @return
      */
-    public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses,String longitude ,String latitude){
-        List<WeekedCourse> weekedCourses = new ArrayList<>();
-        for (int i = 1; i < 8; i++) {
-            WeekedCourse weekedCourse = new WeekedCourse();
-            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()) {
-                List<CourseOfStoreVo> value = integerListEntry.getValue();
-                CourseVenue courseVenue = new CourseVenue();
-                courseVenue.setStoreId(value.get(0).getStoreId());
-                courseVenue.setAreaName(value.get(0).getStoreName());
+    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()) {
+            Integer storeId = integerListEntry.getKey();
+            List<CourseOfStoreVo> value = integerListEntry.getValue();
+            CourseVenue courseVenue = new CourseVenue();
+            courseVenue.setStoreId(storeId);
+            courseVenue.setAreaName(value.get(0).getCourseName());
+            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())) + "");
-
-                List<CourseVenue.CouList> courses = new ArrayList<>();
-                for (CourseOfStoreVo courseOfStoreVo : value) {
-                    CourseVenue.CouList couList = new CourseVenue.CouList();
-                    couList.setCourseID(courseOfStoreVo.getCourseId());
-                    couList.setCourseName(courseOfStoreVo.getCourseName());
-                    couList.setTimeStr(courseOfStoreVo.getClassStartTime() + "-" + courseOfStoreVo.getClassEndTime());
-                    couList.setDetail("");
-                    courses.add(couList);
-                }
-                courseVenue.setCourses(courses);
-                courseVenues.add(courseVenue);
             }
-            weekedCourse.setDetails(courseVenues);
-            weekedCourses.add(weekedCourse);
-        }
-        return weekedCourses;
-    }
+            List<CourseVenue.CouList> courses = new ArrayList<>();
+            for (CourseOfStoreVo courseOfStoreVo : value) {
+                CourseVenue.CouList couList = new CourseVenue.CouList();
+                couList.setCourseID(courseOfStoreVo.getCourseId());
+                couList.setCourseName(courseOfStoreVo.getCourseName());
+                couList.setTimeStr(courseOfStoreVo.getClassStartTime() + "-" + courseOfStoreVo.getClassEndTime());
+                couList.setDetail("¥" + courseOfStoreVo.getCoursePrice() + "/会员扣2学时");
+                couList.setStatus(courseOfStoreVo.getStatus());
 
+                couList.setAllNum(courseOfStoreVo.getAllNum());
+                couList.setUseNum(courseOfStoreVo.getUseNum());
+                couList.setLastNum(courseOfStoreVo.getLastNum());
+                courses.add(couList);
+            }
+            courseVenue.setCourses(courses);
+            courseVenues.add(courseVenue);
+        }
+        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 + "\"}");
@@ -200,48 +434,90 @@
         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(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);
-        if(ToolUtil.isNotEmpty(addAppUserVo.getLatitude()) && ToolUtil.isNotEmpty(addAppUserVo.getLongitude())){
-            Map<String, String> geocode = gdMapGeocodingUtil.geocode(addAppUserVo.getLongitude(), addAppUserVo.getLatitude());
-            if(null != geocode){
-                String province = geocode.get("province");
-                String provinceCode = geocode.get("provinceCode");
-                String city = geocode.get("city");
+        tAppUser.setInsertTime(new Date());
+        tAppUser.setProvince("");
+        tAppUser.setProvinceCode("");
+        tAppUser.setCity("");
+        tAppUser.setCityCode("");
+        // 注册用户
+        int insert = this.baseMapper.insert(tAppUser);
+        // 介绍有礼
+        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());
+            if (null != geocode) {
                 String cityCode = geocode.get("cityCode");
-                tAppUser.setProvince(province);
-                tAppUser.setProvinceCode(provinceCode);
-                tAppUser.setCity(city);
-                tAppUser.setCityCode(cityCode);
+                // 根据所在市code 查询是否有介绍有礼活动
+                List<IntroduceRewards> res = introduceRewardsClient.getGiftList(cityCode);
+                if (res != null) {
+                    for (IntroduceRewards re : res) {
+                        Integer num = re.getGiveClass();
+                        Integer activityId = re.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);
+                        }
+                    }
+                }
             }
         }
-        this.baseMapper.insert(tAppUser);
+
+
         return ResultUtil.success();
     }
 
-
     /**
      * 账号密码登录
+     *
      * @param phone
      * @param password
      * @return
@@ -250,118 +526,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(ToolUtil.isEmpty(value) || !value.equals(loginSMSCodeVo.getCode())){
-            return ResultUtil.error("验证码无效");
+        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);
-            if(ToolUtil.isNotEmpty(loginSMSCodeVo.getLatitude()) && ToolUtil.isNotEmpty(loginSMSCodeVo.getLongitude())){
-                Map<String, String> geocode = gdMapGeocodingUtil.geocode(loginSMSCodeVo.getLongitude(), loginSMSCodeVo.getLatitude());
-                if(null != geocode){
-                    String province = geocode.get("province");
-                    String provinceCode = geocode.get("provinceCode");
-                    String city = geocode.get("city");
-                    String cityCode = geocode.get("cityCode");
-                    tAppUser.setProvince(province);
-                    tAppUser.setProvinceCode(provinceCode);
-                    tAppUser.setCity(city);
-                    tAppUser.setCityCode(cityCode);
-                }
-            }
+            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);
-                if(ToolUtil.isNotEmpty(loginWechatVo.getLatitude()) && ToolUtil.isNotEmpty(loginWechatVo.getLongitude())){
-                    Map<String, String> geocode = gdMapGeocodingUtil.geocode(loginWechatVo.getLongitude(), loginWechatVo.getLatitude());
-                    if(null != geocode){
-                        String province = geocode.get("province");
-                        String provinceCode = geocode.get("provinceCode");
-                        String city = geocode.get("city");
-                        String cityCode = geocode.get("cityCode");
-                        tAppUser.setProvince(province);
-                        tAppUser.setProvinceCode(provinceCode);
-                        tAppUser.setCity(city);
-                        tAppUser.setCityCode(cityCode);
-                    }
-                }
+                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);
@@ -370,9 +640,9 @@
         return token;
     }
 
-
     /**
      * 修改密码
+     *
      * @param phone
      * @param code
      * @param password
@@ -382,15 +652,1829 @@
     @Override
     public ResultUtil updatePassword(String phone, String code, String password) throws Exception {
         String value = redisUtil.getValue(phone);
-        if(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();
+    }
+
+    /**
+     * 定时任务修改到期会员的状态
+     */
+    @Override
+    public void membershipEnd() {
+        this.baseMapper.membershipEnd();
+    }
+
+    /**
+     * 获取加入玩湃首页数据
+     *
+     * @param lon
+     * @param lat
+     * @return
+     * @throws Exception
+     */
+    @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)) {
+            Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
+            if (null != geocode) {
+                String province = geocode.get("province");
+                String provinceCode = geocode.get("provinceCode");
+                String city = geocode.get("city");
+                String cityCode = geocode.get("cityCode");
+                appUser.setProvince(province);
+                appUser.setProvinceCode(provinceCode);
+                appUser.setCity(city);
+                appUser.setCityCode(cityCode);
+                this.updateById(appUser);
+            }
+        }
+
+
+        JoinPlayPaiVo joinPlayPaiVo = new JoinPlayPaiVo();
+        joinPlayPaiVo.setIsVip(appUser.getIsVip());
+        if (ToolUtil.isEmpty(lon) || ToolUtil.isEmpty(lat)) {
+            return joinPlayPaiVo;
+        }
+
+        Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
+        if (null != geocode) {
+            String provinceCode = geocode.get("provinceCode");
+            String cityCode = geocode.get("cityCode");
+            List<Store> stores = storeClient.queryStoreList(new QueryStoreList(provinceCode, cityCode));
+            Store s = null;
+            Double d = 0D;
+            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 > wgs84) {
+                    s = store;
+                    d = wgs84;
+                }
+            }
+            joinPlayPaiVo.setName(s.getName());
+            joinPlayPaiVo.setLon(s.getLon());
+            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, String lon, String lat) {
+        IndexOfUserBenefirVo benefirVo = new IndexOfUserBenefirVo();
+        TAppUser appUser = this.getById(appUserId);
+        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) {
+            benefirVo.setIsMember("年度会员");
+        } else {
+            benefirVo.setIsMember("普通用户");
+        }
+
+        Location location = new Location();
+        location.setLat(lat);
+        location.setLon(lon);
+        List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods(location);
+        benefirVo.setCommodities(convertibleGoods);
+        benefirVo.setImage(icfgClient.getImageConfig());
+        Referee referee = refereeService.getOne(new QueryWrapper<Referee>().eq("phone", appUser.getPhone()).eq("state", 1));
+        benefirVo.setReferee(null == referee ? 0 : 1);
+        return benefirVo;
+    }
+
+    @Override
+    public List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
+        List<ConsumeDetail> details = new ArrayList<>();
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
+        SimpleDateFormat result = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date monthStart = null;
+        Date monthEnd = null;
+        if (StringUtils.hasText(yearMonth)) {
+            monthStart = DateTimeHelper.getCurrentIdetMouthStart(yearMonth);
+            monthEnd = DateTimeHelper.getCurrentIdeaMouthEnd(yearMonth);
+        } else {
+            monthStart = DateTimeHelper.getCurrentMouthStart();
+            monthEnd = DateTimeHelper.getCurrentMouthEnd();
+        }
+
+        BillingDataRequestVo requestVo = new BillingDataRequestVo();
+        requestVo.setMonthStart(result.format(monthStart));
+        requestVo.setMonthEnd(result.format(monthEnd));
+        requestVo.setAppUserId(appUserId);
+//            1.赛事报名
+        BillingRequestVo allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo);
+        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);
+                consumeDetail.setDateTime(paymentCompetition.getDateTime());
+                details.add(consumeDetail);
+            }
+        }
+//            2.取消赛事报名
+        BillingRequestVo cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo);
+        if (ToolUtil.isNotEmpty(cancelOrderOfUserPayRecord.getRequests())) {
+            for (BillingRequest paymentCompetition : cancelOrderOfUserPayRecord.getRequests()) {
+                ConsumeDetail consumeDetail = new ConsumeDetail();
+                consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
+                consumeDetail.setConsumeTime(paymentCompetition.getTime());
+                consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount());
+                consumeDetail.setType(1);
+                consumeDetail.setDateTime(paymentCompetition.getDateTime());
+                details.add(consumeDetail);
+            }
+        }
+
+        //3.课包购买
+        List<CoursePackageOrder> coursePackageOrder = paymentClient.getCoursePackageOrder(requestVo);
+
+        for (CoursePackageOrder order : coursePackageOrder) {
+            ConsumeDetail consumeDetail = new ConsumeDetail();
+            consumeDetail.setConsumeName("课程报名");
+            consumeDetail.setConsumeTime(simpleDateFormat.format(order.getInsertTime()));
+            consumeDetail.setConsumeAmount("-" + order.getCashPayment());
+            consumeDetail.setType(2);
+            consumeDetail.setDateTime(order.getInsertTime().getTime());
+            details.add(consumeDetail);
+        }
+
+
+//            4.场地预约
+        RequestOfTypeVo allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
+        if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())) {
+            for (BillingRequestOfType booking : allSiteBookingList.getRequest()) {
+                ConsumeDetail consumeDetail = new ConsumeDetail();
+                if (booking.getStatus() != 5) {
+                    consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
+                    consumeDetail.setConsumeAmount("-" + booking.getAmount());
+                    consumeDetail.setConsumeTime(booking.getTime());
+                    consumeDetail.setType(2);
+                    consumeDetail.setDateTime(booking.getDateTime());
+                    details.add(consumeDetail);
+                } else {
+                    ConsumeDetail consumeDetail1 = new ConsumeDetail();
+                    consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
+                    consumeDetail1.setConsumeAmount("+" + booking.getAmount());
+                    consumeDetail1.setConsumeTime(booking.getTime());
+                    consumeDetail1.setDateTime(booking.getDateTime());
+                    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);
+                    consumeDetail2.setDateTime(booking.getDateTime());
+                    details.add(consumeDetail2);
+                }
+            }
+        }
+
+//            5.智慧球场
+        GetTGameRecord getTGameRecord = new GetTGameRecord();
+        getTGameRecord.setAppUserId(appUserId);
+        getTGameRecord.setStartTiem(monthStart);
+        getTGameRecord.setEndTime(monthEnd);
+        List<TGameRecord> tGameRecord = gameRecordClient.getTGameRecord(getTGameRecord);
+        for (TGameRecord gameRecord : tGameRecord) {
+            ConsumeDetail consumeDetail = new ConsumeDetail();
+            consumeDetail.setConsumeName(RechargeRecordEnum.SMART_STADIUM.getMsg());
+            consumeDetail.setConsumeTime(simpleDateFormat.format(gameRecord.getTime()));
+            consumeDetail.setConsumeAmount("-" + gameRecord.getMoney());
+            consumeDetail.setType(2);
+            consumeDetail.setDateTime(gameRecord.getTime().getTime());
+            details.add(consumeDetail);
+        }
+
+//            6.年度会员
+        List<VipPayment> vipPayments = vipPaymentMapper.selectList(new QueryWrapper<VipPayment>()
+                .eq("payStatus", 2)
+                .eq("appUserId", appUserId)
+                .between("insertTime", monthStart, monthEnd));
+        if (vipPayments.size() > 0) {
+            for (VipPayment vipPayment : vipPayments) {
+                ConsumeDetail consumeDetail = new ConsumeDetail();
+                consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg());
+                consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime()));
+                consumeDetail.setConsumeAmount("-" + vipPayment.getAmount());
+                consumeDetail.setType(2);
+                consumeDetail.setDateTime(vipPayment.getPayTime().getTime());
+                details.add(consumeDetail);
+            }
+        }
+//            7.充值
+        List<RechargeRecords> rechargeRecords = rrMapper.selectList(new QueryWrapper<RechargeRecords>()
+                .eq("payStatus", 2)
+                .eq("appUserId", appUserId)
+                .between("insertTime", monthStart, monthEnd));
+        if (rechargeRecords.size() > 0) {
+            for (RechargeRecords rechargeRecord : rechargeRecords) {
+                ConsumeDetail consumeDetail = new ConsumeDetail();
+                consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + ":" + rechargeRecord.getPlayPaiCoins() + "币");
+                consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
+                consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount());
+                consumeDetail.setType(2);
+                consumeDetail.setDateTime(rechargeRecord.getPayTime().getTime());
+                details.add(consumeDetail);
+            }
+        }
+
+        //8.积分商场
+
+        List<ConsumeDetail> consumeDetails = mcClient.getConsumeDetails(requestVo);
+        details.addAll(consumeDetails);
+
+
+        //世界杯
+        GetWorldCupPayment getWorldCupPayment = new GetWorldCupPayment();
+        getWorldCupPayment.setAppUserId(appUserId);
+        getWorldCupPayment.setPayType("1,2");
+        getWorldCupPayment.setStartTime(monthStart);
+        getWorldCupPayment.setEndTime(monthEnd);
+        List<WorldCupPayment> worldCupPayment = worldCupPaymentClinet.getWorldCupPayment(getWorldCupPayment);
+        for (WorldCupPayment cupPayment : worldCupPayment) {
+            ConsumeDetail consumeDetail = new ConsumeDetail();
+            if(cupPayment.getPayStatus() != 3){
+                consumeDetail.setConsumeName(RechargeRecordEnum.WORLD_CIP_PAYMENT.getMsg());
+                consumeDetail.setConsumeTime(simpleDateFormat.format(cupPayment.getCreateTime()));
+                consumeDetail.setConsumeAmount("-" + cupPayment.getAmount());
+                consumeDetail.setType(2);
+                consumeDetail.setDateTime(cupPayment.getPayTime().getTime());
+                details.add(consumeDetail);
+            }else{
+                consumeDetail = new ConsumeDetail();
+                consumeDetail.setConsumeName(RechargeRecordEnum.WORLD_CIP_PAYMENT.getMsg());
+                consumeDetail.setConsumeTime(simpleDateFormat.format(cupPayment.getCreateTime()));
+                consumeDetail.setConsumeAmount("-" + cupPayment.getAmount());
+                consumeDetail.setType(2);
+                consumeDetail.setDateTime(cupPayment.getPayTime().getTime());
+                details.add(consumeDetail);
+
+                consumeDetail = new ConsumeDetail();
+                consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_WORLD_CIP_PAYMENT.getMsg());
+                consumeDetail.setConsumeTime(simpleDateFormat.format(cupPayment.getCreateTime()));
+                consumeDetail.setConsumeAmount("+" + cupPayment.getRefundAmount());
+                consumeDetail.setType(1);
+                consumeDetail.setDateTime(cupPayment.getRefundTime().getTime());
+                details.add(consumeDetail);
+            }
+        }
+
+
+        if (details.size() > 0) {
+            Collections.sort(details, new Comparator<ConsumeDetail>() {
+                @Override
+                public int compare(ConsumeDetail record1, ConsumeDetail record2) {
+                    return record1.getDateTime().compareTo(record2.getDateTime()) * -1;
+                }
+            });
+
+            if (ToolUtil.isNotEmpty(recordId)) {
+                details = details.stream()
+                        .filter(response -> Objects.equals(response.getType(), recordId))
+                        .collect(Collectors.toList());
+            }
+        }
+
+        return details;
+    }
+
+    @Override
+    public void cancellation(Integer appUserId) {
+        TAppUser tAppUser = this.baseMapper.selectById(appUserId);
+        if (null != tAppUser) {
+            tAppUser.setState(3);
+            this.baseMapper.updateById(tAppUser);
+        }
+    }
+
+    @Override
+    public List<RechargeCentVo> getSysRechargeConfig(Integer appUserId) {
+        List<RechargeCentVo> centVos = new ArrayList<>();
+        TAppUser tAppUser = this.baseMapper.selectById(appUserId);
+        List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig();
+        System.out.println(rechargeConfig);
+        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 && tAppUser.getVipEndTime().after(new Date())) {
+                    vo.setWpGold((Integer) stringObjectMap.get("MemberCoins"));
+                } else {
+                    vo.setWpGold((Integer) stringObjectMap.get("usersCoins"));
+                }
+                centVos.add(vo);
+            }
+        }
+        return centVos;
+    }
+
+    @Override
+    public List<Goods> queryAppUserIntegral(MallRequest request) {
+        List<Goods> goods = new ArrayList<>();
+
+        CommodityRequest commodityRequest = new CommodityRequest();
+        commodityRequest.setLon(request.getLon());
+        commodityRequest.setLat(request.getLat());
+        PointMerchandiseVo vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
+        if (ToolUtil.isNotEmpty(vicinityGoods.getMerchandises())) {
+            for (PointsMerchandise vicinityGood : vicinityGoods.getMerchandises()) {
+                Goods commodity = new Goods();
+                switch (vicinityGood.getType()) {
+                    case 1:
+                        commodity.setGoodId(vicinityGood.getId());
+                        commodity.setGoodName(vicinityGood.getName());
+                        commodity.setGoodImg(vicinityGood.getCover());
+                        commodity.setCondition(vicinityGood.getRedemptionMethod());
+                        if (vicinityGood.getRedemptionMethod() == 1) {
+                            commodity.setIntegral(vicinityGood.getIntegral().intValue());
+                        } else {
+                            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.getId());
+                        CoursePackage coursePackage = cpageClient.queryCoursePackageById(vicinityGood.getCoursePackageId());
+//                        commodity.setGoodImg(coursePackage.getCoverDrawing());
+                        commodity.setGoodImg(vicinityGood.getCover());
+                        commodity.setGoodName(coursePackage.getName());
+                        commodity.setCondition(vicinityGood.getRedemptionMethod());
+                        if (vicinityGood.getRedemptionMethod() == 1) {
+                            commodity.setIntegral(vicinityGood.getIntegral().intValue());
+                        } else {
+                            commodity.setIntegral(vicinityGood.getIntegral().intValue());
+                            commodity.setAmount(vicinityGood.getCash());
+                        }
+                        commodity.setBelongsType(vicinityGood.getUserPopulation());
+                        commodity.setGoodsType(2);
+                        commodity.setUseScope(vicinityGood.getUseScope());
+
+                        commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+                        commodity.setShopIds(mcsClient.queryPointMerStoreIds(vicinityGood.getId()));
+                        break;
+                    case 3:
+                        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(ToolUtil.isEmpty(vicinityGood.getIntegral()) ? 0 : vicinityGood.getIntegral());
+                            commodity.setAmount(vicinityGood.getCash());
+                        }
+                        commodity.setBelongsType(vicinityGood.getUserPopulation());
+                        commodity.setGoodsType(3);
+                        commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+                        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) {
+                Goods commodity = new Goods();
+                commodity.setGoodId(allCoupon.getId());
+                commodity.setGoodName(allCoupon.getName());
+                commodity.setCondition(allCoupon.getRedemptionMethod());
+                commodity.setGoodImg(allCoupon.getCover());
+                if (allCoupon.getRedemptionMethod() == 1) {
+                    commodity.setIntegral(allCoupon.getIntegral().intValue());
+                } else {
+                    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) {
+                goods = goods.stream()
+                        .filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
+                        .collect(Collectors.toList());
+            }
+        }
+        // 2.0 门店筛选
+        if (request.getShopId() != null) {
+            if (goods.size() > 0) {
+                goods = goods.stream()
+                        .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()) {
+                case 1:
+                    if (goods.size() > 0) {
+                        goods = goods.stream()
+                                .sorted(Comparator.comparing(Goods::getIntegral).reversed())
+                                .collect(Collectors.toList());
+                    }
+                    break;
+                case 2:
+                    if (goods.size() > 0) {
+                        goods = goods.stream()
+                                .sorted(Comparator.comparing(Goods::getIntegral))
+                                .collect(Collectors.toList());
+                    }
+                    break;
+                case 3:
+                    if (goods.size() > 0) {
+                        goods = goods.stream()
+                                .sorted(Comparator.comparing(Goods::getNums).reversed())
+                                .collect(Collectors.toList());
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+        }
+        if (null != request.getGoodsType()) {
+            if (goods.size() > 0) {
+                goods = goods.stream()
+                        .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
+                        .collect(Collectors.toList());
+            }
+        }
+
+        //当前第几页
+        int pageNo = request.getPageNum();
+        //一页五条
+        int size = request.getPageSize();
+
+        //分页
+        goods = goods.stream().skip((pageNo - 1) * size).limit(size).
+                collect(Collectors.toList());
+        return goods;
+    }
+
+    @Override
+    public ProductDetailsVo productDetails(Integer goodId, Integer goodsType) {
+        ProductDetailRequest detailsVo = new ProductDetailRequest();
+        detailsVo.setGoodsType(goodsType);
+        detailsVo.setGoodId(goodId);
+        return mcClient.getGoodDetailsWithId(detailsVo);
+    }
+
+    @Override
+    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("您的账号已被冻结");
+        }
+        boolean newUser = false;
+        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);
+            newUser = true;
+        }
+
+        if (newUser && 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(null == tAppUser1){
+                return ResultUtil.error("邀请人还未注册账号");
+            }
+            Map<String, String> geocode = null;
+            try {
+                geocode = gdMapGeocodingUtil.geocode(dto.getLon(), dto.getLat());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if (null != geocode) {
+                String cityCode = geocode.get("cityCode");
+                // 根据所在市code 查询是否有介绍有礼活动
+                List<IntroduceRewards> res = introduceRewardsClient.getGiftList(cityCode);
+                if (res != null) {
+                    for (IntroduceRewards re : res) {
+                        Integer num = re.getGiveClass();
+                        Integer activityId = re.getId();
+                        if (num != 0) {
+                            TAppGift tAppGift = new TAppGift();
+                            tAppGift.setUserName(tAppUser1.getName());
+                            tAppGift.setUserPhone(tAppUser1.getPhone());
+                            tAppGift.setUserId(tAppUser1.getId());
+                            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);
+                        }
+                    }
+                }
+            }
+        }
+        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) {
+            List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
+                    .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 {
+            PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerId);
+            if (pointsMerchandise.getType() == 4) {
+                List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId);
+                StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreIds.get(0));
+                if (ToolUtil.isNotEmpty(courseOfStore)) {
+                    response.setStoreId(couponStoreIds.get(0));
+                    response.setStoreName(courseOfStore.getStoreName());
+                }
+            } else {
+                List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId);
+                StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integers.get(0));
+                if (ToolUtil.isNotEmpty(courseOfStore)) {
+                    response.setStoreId(integers.get(0));
+                    response.setStoreName(courseOfStore.getStoreName());
+                }
+            }
+            return response;
+        }
+    }
+
+    @Override
+    @Transactional
+    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);
+            if (usercounts == coupon.getPickUpQuantity()) {
+                return new ResultUtil<>(0, "限领数量已达最大");
+            }
+            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){
+                        String temp = "0";
+                        if (coupon.getPublisherType()!=null && coupon.getPublisherType() != 2){
+                            // 做分账
+                            temp = "1";
+                        }
+                        return weChatPaymentCoupon("购买优惠券-"+temp, userCouponPayment);
+                    }
+                    if(exchangeType.getPayType() == 2){
+                        return aliPaymentCoupon("购买优惠券", userCouponPayment);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        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("超过发放数量");
+            }
+
+            //新增积分商品兑换记录
+            UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
+            pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
+            pointsMerchandise.setUserId(userIdFormRedis);
+            pointsMerchandise.setGoodsNumber(goodsNums);
+            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);
+                pointsMerchandise.setPaymentTime(new Date());
+            } 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());
+            pointsMerchandise.setPayType(exchangeType.getExchangeType());
+            if(null != merchandise.getIntegral()){
+                pointsMerchandise.setIntegral(merchandise.getIntegral() * goodsNums);
+            }
+            if(exchangeType.getExchangeType() == 2 || exchangeType.getExchangeType() == 3){
+                pointsMerchandise.setCash(merchandise.getCash());
+                pointsMerchandise.setCashPayType(exchangeType.getPayType());
+            }
+            
+            Double m = new BigDecimal((merchandise.getIntegral() == null ? 0 : merchandise.getIntegral())).add((merchandise.getCash() == null ? BigDecimal.ZERO : merchandise.getCash())).doubleValue();
+            if((m * goodsNums) == 0) {
+                pointsMerchandise.setPayStatus(2);
+                pointsMerchandise.setPaymentTime(new Date());
+            }
+            returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+            if((m * goodsNums) == 0 && pointsMerchandise.getPayStatus() == 2){
+                returnModel.setReturnId(returnId);
+                return ResultUtil.success(returnModel);
+            }
+
+            System.err.println("兑换方式"+exchangeType);
+            switch (exchangeType.getExchangeType()) {
+//            积分
+                case 1:
+                    boolean b = dealAppUserIntegral(userIdFormRedis, tAppUser, merchandise.getIntegral() * goodsNums);
+                    if (b) switch (exchangeType.getGoodsType()) {
+                        case 2:
+                            code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
+                            List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
+                            CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
+                            coursePackageOrder.setCode(code);
+                            coursePackageOrder.setAppUserId(userIdFormRedis);
+                            String ids = exchangeType.getStuIds().stream().map(s -> {
+                                return String.valueOf(s);
+                            }).collect(Collectors.joining(";"));
+                            coursePackageOrder.setStudentIds(ids);
+                            coursePackageOrder.setCoursePackageId(merchandise.getCoursePackageId());
+                            coursePackageOrder.setPayType(4);
+                            CoursePackagePaymentConfig config = null;
+                            for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
+                                if (coursePackagePaymentConfig.getId().compareTo(merchandise.getCoursePackageConfigId()) == 0) {
+                                    coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
+                                    coursePackageOrder.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
+
+                                    config = coursePackagePaymentConfig;
+                                    break;
+                                }
+                            }
+                            coursePackageOrder.setPlayPaiCoin(merchandise.getIntegral());
+                            coursePackageOrder.setPayUserType(1);
+                            coursePackageOrder.setPayStatus(2);
+                            coursePackageOrder.setPayUserId(userIdFormRedis);
+                            coursePackageOrder.setStatus(1);
+                            coursePackageOrder.setState(1);
+                            coursePackageOrder.setInsertTime(new Date());
+                            coursePackageOrder.setOrderType(2);
+                            Long coursePackageOrderId = paymentClient.savePaymentCoursePackage(coursePackageOrder);
+
+                            AddCoursePackageOrderStudent addCoursePackageOrderStudent = new AddCoursePackageOrderStudent();
+                            addCoursePackageOrderStudent.setCoursePackageOrderId(coursePackageOrderId);
+                            addCoursePackageOrderStudent.setCoursePackagePaymentConfig(config);
+                            paymentClient.addCoursePackageOrderStudent(addCoursePackageOrderStudent);
+                            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:
+//                积分+现金
+                    switch (exchangeType.getPayType()) {
+                        case 1:
+                            try {
+                                if (merchandise.getType() == 2) {
+                                    List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
+                                    CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
+                                    coursePackageOrder.setCode(code);
+                                    coursePackageOrder.setAppUserId(userIdFormRedis);
+                                    String ids = exchangeType.getStuIds().stream().map(s -> {
+                                        return String.valueOf(s);
+                                    }).collect(Collectors.joining(";"));
+                                    coursePackageOrder.setStudentIds(ids);
+                                    coursePackageOrder.setCoursePackageId(merchandise.getCoursePackageId());
+                                    coursePackageOrder.setPayType(5);
+                                    CoursePackagePaymentConfig config = null;
+                                    for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
+                                        if (coursePackagePaymentConfig.getId().compareTo(merchandise.getCoursePackageConfigId()) == 0) {
+                                            coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
+                                            coursePackageOrder.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
+                                            break;
+                                        }
+                                    }
+                                    coursePackageOrder.setCashPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())));
+                                    coursePackageOrder.setPlayPaiCoin(merchandise.getIntegral() * exchangeType.getStuIds().size());
+                                    coursePackageOrder.setPayUserType(1);
+                                    coursePackageOrder.setPayStatus(1);
+                                    coursePackageOrder.setPayUserId(userIdFormRedis);
+                                    coursePackageOrder.setStatus(1);
+                                    coursePackageOrder.setState(1);
+                                    coursePackageOrder.setInsertTime(new Date());
+                                    coursePackageOrder.setOrderType(2);
+                                    paymentClient.savePaymentCoursePackage(coursePackageOrder);
+                                    return WechatPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,merchandise.getId());
+                                } else if (merchandise.getType() == 1){
+                                    return WechatPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,merchandise.getId());
+                                }else if(merchandise.getType() == 3){
+                                    return WechatPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,merchandise.getId());
+                                }
+                            } catch (Exception e) {
+                                return ResultUtil.runErr();
+                            }
+                        case 2:
+                            if (merchandise.getType() == 2) {
+                                return AlipayPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code, returnId);
+                            } else {
+                                return AlipayPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(goodsNums)), code, returnId);
+                            }
+                        default:
+                            break;
+                    }
+                    break;
+                case 3:
+                    switch (exchangeType.getPayType()) {
+                        case 1:
+                            try {
+                                if (merchandise.getType() == 2) {
+                                    return WechatPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,merchandise.getId());
+                                } else {
+                                    return WechatPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,merchandise.getId());
+                                }
+                            } catch (Exception e) {
+                                return ResultUtil.runErr();
+                            }
+                        case 2:
+                            if (merchandise.getType() == 2) {
+                                return AlipayPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code, returnId);
+                            } else {
+                                return AlipayPayment(merchandise.getType(), merchandise.getCash().multiply(new BigDecimal(goodsNums)), code, returnId);
+                            }
+                        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();
+        Integer couponId = userCouponPayment.getCouponId();
+        Coupon coupon = userConponClient.queryCouponById(couponId);
+        String temp ="0";
+        if (coupon.getPublisherType()!=null&&coupon.getPublisherType()!=2){
+            temp  = "1";
+        }
+        System.err.println("购买优惠券");
+        ResultUtil weixinpay = payMoneyUtil.weixinpay(body+"-"+temp, "", 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) || "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) || "NOTPAY".equals(s)) {
+                                    num++;
+                                }
+                            }
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).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) throws Exception {
+        System.err.println("进入回调");
+        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()){
+            //扣积分
+            SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+            vo.setAppUserId(userCouponPayment1.getUserId());
+            vo.setIntegral(userCouponPayment1.getIntegral().intValue() * -1);
+            vo.setRemark("兑换优惠券");
+            vo.setType(2);
+            userIntegralChangesService.saveUserIntegralChanges(vo);
+        }
+        Coupon coupon = ucponClient.queryCouponById(userCouponPayment1.getCouponId());
+        // 创建一个两分钟后执行的线程
+        new Thread(() -> {
+            try {
+                Thread.sleep(120000);
+                if (coupon!=null){
+                    if (coupon.getPublisherType()!=null&&coupon.getPublisherType()!=2){
+                        if (coupon.getPublisherType() == 1){
+                            System.err.println("进入分账逻辑");
+                            // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
+                            String proportionByOperatorId = storeClient.getProportionByOperatorId(coupon.getCityManagerId());
+                            System.err.println("分账比例:"+proportionByOperatorId);
+                            String[] split = proportionByOperatorId.split(",");
+                            String s1 = split[0];
+                            if (!s1.equals("未设置")){
+                                BigDecimal bigDecimal = new BigDecimal(s1);
+                                // 分账比例
+                                BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
+                                // 微信商户号
+                                String s2 = storeClient.getmerchantNumberByOperatorId(coupon.getCityManagerId());
+                                System.err.println("商户号"+s2);
+                                System.err.println("分账比例"+bigDecimal1);
+                                System.err.println("分账金额"+coupon.getCash().multiply(bigDecimal1));
+                                ResultUtil fenzhang = payMoneyUtil.fenzhang(userCouponPayment1.getOrderNumber(), coupon.getCash().multiply(bigDecimal1), s2,"");
+                                if (!fenzhang.getCode().equals(200)){
+                                    System.err.println("分账失败 原因是:"+fenzhang.getMsg());
+                                }
+
+                            }
+                        } else if (coupon.getPublisherType() == 3){
+                            // 门店 向上查询运营商
+                            Store store = storeClient.queryStoreById(coupon.getCityManagerId());
+                            if (store.getOperatorId()==null || store.getOperatorId()==0){
+                                // 平台不分账
+                            }else{
+                                // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
+                                String proportionByOperatorId = storeClient.getProportionByOperatorId(store.getOperatorId());
+                                String[] split = proportionByOperatorId.split(",");
+                                String s1 = split[0];
+                                if (!s1.equals("未设置")){
+                                    BigDecimal bigDecimal = new BigDecimal(s1);
+                                    // 分账比例
+                                    BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
+                                    // 微信商户号
+                                    String s2 = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
+                                    ResultUtil fenzhang = payMoneyUtil.fenzhang(userCouponPayment1.getOrderNumber(), coupon.getCash().multiply(bigDecimal1), s2,"购买优惠券分账");
+                                    if (!fenzhang.getCode().equals(200)){
+                                        System.err.println("分账失败 原因是:"+fenzhang.getMsg());
+                                    }else{
+                                        System.err.println("分账成功");
+                                        return;
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }).start();
+
+        return ResultUtil.success();
+    }
+
+    public boolean dealAppUserIntegral(Integer appUserId, TAppUser appUser, Integer points) {
+        try {
+            if (ToolUtil.isEmpty(appUser.getIntegral()) || (ToolUtil.isNotEmpty(appUser.getIntegral()) && appUser.getIntegral() < points)) {
+                return false;
+            }
+            //        积分变更记录
+            UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
+            userIntegralChanges.setAppUserId(appUserId);
+            userIntegralChanges.setOldIntegral(appUser.getIntegral());
+            userIntegralChanges.setType(2);
+            appUser.setIntegral(null == appUser.getIntegral() ? points : appUser.getIntegral() - points);
+            userIntegralChanges.setNewIntegral(appUser.getIntegral());
+            userIntegralChanges.setInsertTime(new Date());
+            userIntegralChanges.setCategory(2);
+            uicMapper.insert(userIntegralChanges);
+
+            this.baseMapper.updateById(appUser);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private ResultUtil AlipayPayment(Integer type, BigDecimal cash, String code, Long returnId) {
+        String name = (type == 1 ? "购买实体商品" : type == 2 ? "报名运动营": type == 3 ? "购买门票" : "购买优惠券");
+        ResultUtil alipay = payMoneyUtil.alipay(smid,name, name, String.valueOf(returnId), code, cash.toString(),
+                "/base/pointMer/exchangeGoodPaymentAliCallback");
+        if (alipay.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);
+                            System.out.println("code:" + code);
+                            List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
+                            System.out.println("list-----" + userPointsMerchandises);
+                            if (userPointsMerchandises.get(0).getPayStatus() == 2) {
+                                break;
+                            }
+//                            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");
+
+                                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.setPaymentTime(new Date());
+                                        userPointsMerchandise.setOrderNumber(tradeNo);
+                                        userPointsMerchandise.setCashPayType(2);
+                                        userPointsMerchandise.setInsertTime(null);
+                                        userPointsMerchandise.setUserId(null);
+                                        mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
+                                    }
+                                    moneyOut(tradeNo, tradeNo);
+                                    break;
+                                }
+                                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) {
+                        mcClient.deletePaymentRecord(code);
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }
+        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(Integer type, BigDecimal cash, String code,Integer id) throws Exception {
+        String name = (type == 1 ? "购买实体商品" : type == 2 ? "报名运动营": type == 3 ? "购买门票" : "购买优惠券");
+        System.err.println("微信支付:"+name);
+
+        PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(id);
+        System.err.println("查询积分商品"+pointsMerchandise);
+        // 分账表示 0否1是
+        String temp = "0";
+        switch (type){
+            case 1:
+                temp = "0";
+                break;
+            case 2:
+                // 判断课包属于平台还是运营商
+                CoursePackage coursePackage = cpageClient.queryCoursePackageById(pointsMerchandise.getCoursePackageId());
+                Store store = storeClient.queryStoreById(coursePackage.getStoreId());
+                if (store.getOperatorId() ==null || store.getOperatorId() == 0){
+                    // 平台课包 不分账
+                }else{
+                    temp = "1";
+                }
+                break;
+            case 3:
+                List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerchandise.getId());
+                if (!integers.isEmpty()){
+                    Store store1 = storeClient.queryStoreById(integers.get(0));
+                    if (store1.getOperatorId() ==null || store1.getOperatorId() == 0){
+                        // 平台门票 不分账
+                    }else{
+                        temp = "1";
+                    }
+                }
+                // 查询门票指定的门店 属于平台还是运营商
+                break;
+        }
+        System.err.println("支付");
+        ResultUtil weixinpay = payMoneyUtil.weixinpay(name+"-"+temp, "", code, cash.toString(),
+                "/base/pointMer/exchangeGoodPaymentWeChatCallback", "APP", "");
+        System.err.println("提交支付"+weixinpay);
+        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);
+                            UserPointsMerchandise userPointsMerchandise = mcClient.queryUserPointMerchaseByCode(code).get(0);
+                            if (userPointsMerchandise.getPayStatus() == 2) {
+
+
+                                break;
+                            }
+                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
+                            if (resultUtil.getCode() == 200 && userPointsMerchandise.getPayStatus() == 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) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+                                    mcClient.deletePaymentRecord(code);
+                                    break;
+                                }
+                                if ("SUCCESS".equals(s)) {
+                                    userPointsMerchandise.setPayStatus(2);
+                                    userPointsMerchandise.setPaymentTime(new Date());
+                                    userPointsMerchandise.setOrderNumber(transaction_id);
+                                    userPointsMerchandise.setCashPayType(1);
+                                    mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
+
+                                    TAppUser tAppUser = baseMapper.selectById(userPointsMerchandise.getUserId());
+                                    dealAppUserIntegral(userPointsMerchandise.getUserId(), tAppUser, userPointsMerchandise.getIntegral());
+
+                                    //课程
+                                    if(type == 2){
+                                        CoursePackageOrder coursePackageOrder1 = paymentClient.getCoursePackageOrderByCode(code);
+                                        if(null != coursePackageOrder1){
+                                            coursePackageOrder1.setPayStatus(2);
+                                            coursePackageOrder1.setOrderNumber(transaction_id);
+                                            coursePackageOrder1.setAppUserId(null);
+                                            paymentClient.updateCoursePackageOrder(coursePackageOrder1);
+
+                                            GetCoursePackagePaymentConfig getCoursePackagePaymentConfig = new GetCoursePackagePaymentConfig();
+                                            getCoursePackagePaymentConfig.setCoursePackageId(coursePackageOrder1.getCoursePackageId());
+                                            getCoursePackagePaymentConfig.setClassHours(coursePackageOrder1.getClassHours());
+                                            CoursePackagePaymentConfig coursePackagePaymentConfig = paymentClient.getCoursePackagePaymentConfig(getCoursePackagePaymentConfig);
+
+                                            AddCoursePackageOrderStudent addCoursePackageOrderStudent = new AddCoursePackageOrderStudent();
+                                            addCoursePackageOrderStudent.setCoursePackageOrderId(coursePackageOrder1.getId());
+                                            addCoursePackageOrderStudent.setCoursePackagePaymentConfig(coursePackagePaymentConfig);
+                                            paymentClient.addCoursePackageOrderStudent(addCoursePackageOrderStudent);
+                                        }
+                                    }
+                                    break;
+                                }
+                                if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
+                                    num++;
+                                }
+                            }
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }
+        return weixinpay;
+    }
+
+    @Override
+    public ResultUtil exchangeAddPaymentCallback(String code, String orderNumber) {
+        System.err.println("进入回调"+code);
+        UserPointsMerchandise userPointsMerchandise = mcClient.queryUserPointMerchaseByCode(code).get(0);
+        System.err.println("商品"+userPointsMerchandise);
+        if (userPointsMerchandise.getPayStatus() == 2) {
+            return ResultUtil.success();
+        }
+
+        userPointsMerchandise.setOrderNumber(orderNumber);
+        userPointsMerchandise.setPayStatus(2);
+        userPointsMerchandise.setPaymentTime(new Date());
+        mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
+
+        TAppUser tAppUser = baseMapper.selectById(userPointsMerchandise.getUserId());
+        dealAppUserIntegral(userPointsMerchandise.getUserId(), tAppUser, userPointsMerchandise.getIntegral());
+
+        Integer pointsMerchandiseId = userPointsMerchandise.getPointsMerchandiseId();
+        PointsMerchandise pointsMerchandise = mcClient.selectPointsMerchandiseById(pointsMerchandiseId);
+        if(pointsMerchandise.getType() == 2){
+            //课程
+            CoursePackageOrder coursePackageOrder1 = paymentClient.getCoursePackageOrderByCode(code);
+            if(null != coursePackageOrder1){
+                coursePackageOrder1.setPayStatus(2);
+                coursePackageOrder1.setOrderNumber(orderNumber);
+                coursePackageOrder1.setAppUserId(null);
+                paymentClient.updateCoursePackageOrder(coursePackageOrder1);
+
+                GetCoursePackagePaymentConfig getCoursePackagePaymentConfig = new GetCoursePackagePaymentConfig();
+                getCoursePackagePaymentConfig.setCoursePackageId(coursePackageOrder1.getCoursePackageId());
+                getCoursePackagePaymentConfig.setClassHours(coursePackageOrder1.getClassHours());
+                CoursePackagePaymentConfig coursePackagePaymentConfig = paymentClient.getCoursePackagePaymentConfig(getCoursePackagePaymentConfig);
+
+                AddCoursePackageOrderStudent addCoursePackageOrderStudent = new AddCoursePackageOrderStudent();
+                addCoursePackageOrderStudent.setCoursePackageOrderId(coursePackageOrder1.getId());
+                addCoursePackageOrderStudent.setCoursePackagePaymentConfig(coursePackagePaymentConfig);
+                paymentClient.addCoursePackageOrderStudent(addCoursePackageOrderStudent);
+            }
+        }
+        // 创建一个2分钟后执行的线程
+        new Thread(() -> {
+            try {
+                // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
+                Thread.sleep(1000 * 60 * 2);
+                // 分账表示 0否1是
+                String temp = "0";
+                // 运营商id
+                Integer operatorId = 0;
+                System.err.println("商品"+pointsMerchandise);
+                switch (pointsMerchandise.getType()){
+                    case 1:
+                        temp = "0";
+                        break;
+                    case 2:
+                        // 判断课包属于平台还是运营商
+                        CoursePackage coursePackage = cpageClient.queryCoursePackageById(pointsMerchandise.getCoursePackageId());
+                        Store store = storeClient.queryStoreById(coursePackage.getStoreId());
+                        if (store.getOperatorId() ==null || store.getOperatorId() == 0){
+                            // 平台课包 不分账
+                        }else{
+                            temp = "1";
+                            operatorId = store.getOperatorId();
+                        }
+                        break;
+                    case 3:
+                        List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerchandise.getId());
+                        System.err.println("门店ids"+integers);
+                        if (!integers.isEmpty()){
+                            Store store1 = storeClient.queryStoreById(integers.get(0));
+                            if (store1.getOperatorId() ==null || store1.getOperatorId() == 0){
+                                // 平台门票 不分账
+                            }else{
+                                temp = "1";
+                                operatorId = store1.getOperatorId();
+                            }
+                        }
+                        // 查询门票指定的门店 属于平台还是运营商
+                        break;
+                }
+                System.err.println("运营商id"+operatorId);
+                if (operatorId != 0) {
+                    //课程
+                    if(pointsMerchandise.getType() == 2){
+                        //课程
+                        CoursePackageOrder coursePackageOrder1 = paymentClient.getCoursePackageOrderByCode(code);
+                        if(null != coursePackageOrder1){
+                            coursePackageOrder1.setPayStatus(2);
+                            coursePackageOrder1.setOrderNumber(orderNumber);
+                            coursePackageOrder1.setAppUserId(null);
+                            paymentClient.updateCoursePackageOrder(coursePackageOrder1);
+
+                            GetCoursePackagePaymentConfig getCoursePackagePaymentConfig = new GetCoursePackagePaymentConfig();
+                            getCoursePackagePaymentConfig.setCoursePackageId(coursePackageOrder1.getCoursePackageId());
+                            getCoursePackagePaymentConfig.setClassHours(coursePackageOrder1.getClassHours());
+                            CoursePackagePaymentConfig coursePackagePaymentConfig = paymentClient.getCoursePackagePaymentConfig(getCoursePackagePaymentConfig);
+
+                            AddCoursePackageOrderStudent addCoursePackageOrderStudent = new AddCoursePackageOrderStudent();
+                            addCoursePackageOrderStudent.setCoursePackageOrderId(coursePackageOrder1.getId());
+                            addCoursePackageOrderStudent.setCoursePackagePaymentConfig(coursePackagePaymentConfig);
+                            paymentClient.addCoursePackageOrderStudent(addCoursePackageOrderStudent);
+                            // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
+                            String proportionByOperatorId = storeClient.getProportionByOperatorId(operatorId);
+                            String[] split = proportionByOperatorId.split(",");
+                            String s1 = split[0];
+                            if (!s1.equals("未设置")){
+                                BigDecimal bigDecimal = new BigDecimal(s1);
+                                // 分账比例
+                                BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
+                                // 微信商户号
+                                String s2 = storeClient.getmerchantNumberByOperatorId(operatorId);
+
+                                ResultUtil fenzhang = payMoneyUtil.fenzhang(orderNumber, coursePackageOrder1.getCashPayment().multiply(bigDecimal1), s2,"运动营商品");
+                                if (!fenzhang.getCode().equals(200)){
+                                    System.err.println("分账失败 原因是:"+fenzhang.getMsg());
+                                }
+                            }
+                        }
+                    }else{
+                        System.err.println("门票");
+                        // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
+                        String proportionByOperatorId = storeClient.getProportionByOperatorId(operatorId);
+                        System.err.println("分账比例"+proportionByOperatorId);
+                        String[] split = proportionByOperatorId.split(",");
+                        String s1 = split[0];
+                        if (!s1.equals("未设置")){
+                            BigDecimal bigDecimal = new BigDecimal(s1);
+                            // 分账比例
+                            BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
+                            // 微信商户号
+                            String s2 = storeClient.getmerchantNumberByOperatorId(operatorId);
+                            System.err.println("微信商户号"+s2);
+
+                            ResultUtil fenzhang = payMoneyUtil.fenzhang(orderNumber, pointsMerchandise.getCash().multiply(bigDecimal1), s2,"门票");
+                            if (!fenzhang.getCode().equals(200)){
+                                System.err.println("分账失败 原因是:"+fenzhang.getMsg());
+                            }
+                        }
+                    }
+
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }).start();
+        return ResultUtil.success();
+    }
+
+    @Override
+    public List<StoreResponse> queryStoresOfExchange(Integer goodsType, Integer pointsMerId) {
+        List<StoreResponse> responses = new ArrayList<>();
+        if (goodsType == 4) {
+            List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId);
+            if (couponStoreIds.size() > 0) {
+                for (Integer couponStoreId : couponStoreIds) {
+                    StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreId);
+                    if (ToolUtil.isNotEmpty(courseOfStore)) {
+                        StoreResponse response = new StoreResponse();
+                        response.setStoreId(couponStoreId);
+                        response.setStoreName(courseOfStore.getStoreName());
+                        responses.add(response);
+                    }
+                }
+            }
+
+        } else {
+            List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId);
+            if (integers.size() > 0) {
+                for (Integer integer : integers) {
+                    StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integer);
+                    if (ToolUtil.isNotEmpty(courseOfStore)) {
+                        StoreResponse response = new StoreResponse();
+                        response.setStoreId(integer);
+                        response.setStoreName(courseOfStore.getStoreName());
+                        responses.add(response);
+                    }
+                }
+            }
+        }
+        return responses;
+    }
+
+
+    @Override
+    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);
+        weeksOfCourseRest.setStuId(stuId);
+        weeksOfCourseRest.setAppUserId(appUserId);
+        List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses(weeksOfCourseRest);
+        System.out.println(storeOfCourses);
+        if (storeOfCourses.size() > 0) {
+            courseVenues = dealDatas(storeOfCourses, longitude, latitude);
+        }
+        return courseVenues;
+    }
+
+
 }

--
Gitblit v1.7.1