From 2dda6304029c95e171b2f9e32406eb4600d77ebd Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 01 十一月 2023 18:57:58 +0800 Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 307 insertions(+), 48 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java index d420ca5..2bee448 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java @@ -1,10 +1,10 @@ package com.dsh.account.service.impl; +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.Coach; -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.feignclient.activity.IntroduceRewardsClient; import com.dsh.account.feignclient.activity.UserConponClient; import com.dsh.account.feignclient.activity.model.IntrduceOfUserRequest; @@ -13,37 +13,38 @@ import com.dsh.account.feignclient.competition.model.GetStuSourseList; import com.dsh.account.feignclient.competition.model.PurchaseRecordVo; import com.dsh.account.feignclient.competition.model.SaveParticipant; -import com.dsh.account.feignclient.course.CancelListClient; -import com.dsh.account.feignclient.course.CoursePaymentClient; -import com.dsh.account.feignclient.course.CourseRecordClient; -import com.dsh.account.feignclient.course.CourseSessionNameClient; +import com.dsh.account.feignclient.course.*; import com.dsh.account.feignclient.course.model.*; import com.dsh.account.feignclient.other.NoticeClient; import com.dsh.account.feignclient.other.QuestionClient; +import com.dsh.account.feignclient.other.SiteClient; import com.dsh.account.feignclient.other.StoreClient; import com.dsh.account.feignclient.other.model.*; import com.dsh.account.mapper.CoachMapper; import com.dsh.account.mapper.TAppUserMapper; import com.dsh.account.mapper.TStudentMapper; -import com.dsh.account.model.vo.classDetails.AppointmentRecordVo; import com.dsh.account.model.vo.classDetails.ClasspaymentRequest; +import com.dsh.account.model.vo.classDetails.StuEditInfoReq; import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo; import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq; import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo; -import com.dsh.account.model.vo.exploreDetail.ExploreDatasVo; import com.dsh.account.model.vo.exploreDetail.LonLatRequest; -import com.dsh.account.model.vo.exploreDetails.QuestionDetailsVo; -import com.dsh.account.model.vo.exploreDetails.QuestionIns; +import com.dsh.account.model.vo.exploreDetail.QuestionIns; +import com.dsh.account.model.vo.exploreDetail.StoreDetailsVo; +import com.dsh.account.model.vo.exploreDetail.StoreOfCourseVo; import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo; import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp; import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest; +import com.dsh.account.service.TCourseInfoRecordService; import com.dsh.account.service.TStudentService; import com.dsh.account.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -104,6 +105,15 @@ private PayMoneyUtil payMoneyUtil; + @Resource + private SiteClient steClient; + + @Resource + private CourseListClient culisClient; + + @Autowired + private TCourseInfoRecordService courseInfoRecordService; + @Override @@ -126,11 +136,21 @@ student.setHeight(stu.getHeight()); student.setWeight(stu.getWeight()); BigDecimal bigDecimal = BigDecimal.valueOf(stu.getWeight()); - BigDecimal multiply = bigDecimal.subtract(BigDecimal.valueOf(stu.getHeight())).multiply(bigDecimal.subtract(BigDecimal.valueOf(stu.getHeight()))); - multiply.setScale(2); - student.setBmi(multiply.doubleValue()); + double v = stu.getHeight() / 100; + double v1 = v * v; + BigDecimal bigDecimal1 = new BigDecimal(v1).setScale(2, RoundingMode.HALF_UP); + double v2 = bigDecimal.doubleValue() / bigDecimal1.doubleValue(); + BigDecimal bigDecimal2 = new BigDecimal(v2).setScale(2, RoundingMode.HALF_UP); + student.setBmi(bigDecimal2.doubleValue()); student.setInsertTime(new Date()); student.setState(1); + + List<TStudent> tStudents = this.baseMapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, appUserId)); + if(tStudents.size()>0){ + student.setIsDefault(2); + }else { + student.setIsDefault(1); + } this.baseMapper.insert(student); //同步信息到参赛人员信息中 @@ -198,9 +218,9 @@ getStuOfCoursesDetails.setStuId(stuId); getStuOfCoursesDetails.setAppUserId(userIdFormRedis); StuWithCoursesListVo stuOfCoursesDetails = couPayClient.getStuOfCoursesDetails(getStuOfCoursesDetails); - insVo.setTotalNums(stuOfCoursesDetails.getTotalNums()); - insVo.setDeductedNums(stuOfCoursesDetails.getDeductedNums()); - insVo.setRemainingNums(stuOfCoursesDetails.getRemainingNums()); + insVo.setTotalNums(ToolUtil.isEmpty(stuOfCoursesDetails.getTotalNums()) ? 0 : stuOfCoursesDetails.getTotalNums()); + insVo.setDeductedNums(ToolUtil.isEmpty(stuOfCoursesDetails.getDeductedNums()) ? 0 : stuOfCoursesDetails.getDeductedNums()); + insVo.setRemainingNums(ToolUtil.isEmpty(stuOfCoursesDetails.getRemainingNums()) ? 0 : stuOfCoursesDetails.getRemainingNums()); GetStudentCourse course = new GetStudentCourse(); course.setCourseId(lessonId); course.setStuId(stuId); @@ -215,12 +235,25 @@ @Override public List<PurchaseRecordVo> queryDeduRecordDetails(RecordTimeRequest timeRequest,Integer appUserId) { List<PurchaseRecordVo> purchaseRecordVoList = new ArrayList<>(); - Date startTime = DateTimeHelper.getCurrentIdetMouthStart(timeRequest.getStartTime()); - Date endTime = DateTimeHelper.getCurrentIdeaMouthEnd(timeRequest.getEndTime()); + String time = timeRequest.getTime(); + Date monthStart = null; + Date monthEnd = null; + if (StringUtils.hasText(time)) { + monthStart = DateTimeHelper.getCurrentIdetMouthStart(time); + monthEnd = DateTimeHelper.getCurrentIdeaMouthEnd(time); + } else { + monthStart = DateTimeHelper.getCurrentMouthStart(); + monthEnd = DateTimeHelper.getCurrentMouthEnd(); + } + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); + Date startTime = DateTimeHelper.getCurrentIdetMouthStart(simpleDateFormat.format(monthStart)); + Date endTime = DateTimeHelper.getCurrentIdeaMouthEnd(simpleDateFormat.format(monthEnd)); GetStuSourseList getStuSourseList = new GetStuSourseList(); getStuSourseList.setStartTime(startTime); getStuSourseList.setEndTime(endTime); getStuSourseList.setAppUserId(appUserId); + // 报名赛事 List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(getStuSourseList); purchaseRecordVoList.addAll(stuSourseList); @@ -237,18 +270,65 @@ getStuSessionList.setEndTime(endTime); getStuSessionList.setStuId(timeRequest.getStuId()); getStuSessionList.setAppUserId(appUserId); + // 购买课包 List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(getStuSessionList); purchaseRecordVoList.addAll(purchaseRecordVos); List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>() .eq("referralUserId",appUserId ) .between("insertTime",startTime ,endTime)); - List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()); - IntrduceOfUserRequest request = new IntrduceOfUserRequest(); - request.setStartTime(startTime); - request.setEndTime(endTime); - request.setUserIds(userIds); - List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request); - purchaseRecordVoList.addAll(purchaseRecordVos1); + if (ToolUtil.isNotEmpty(tAppUsers)){ + List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()); + IntrduceOfUserRequest request = new IntrduceOfUserRequest(); + request.setStartTime(startTime); + request.setEndTime(endTime); + request.setUserIds(userIds); + // 介绍有礼 + List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request); + purchaseRecordVoList.addAll(purchaseRecordVos1); + } + + LambdaQueryWrapper<TCourseInfoRecord> eq = new LambdaQueryWrapper<TCourseInfoRecord>().eq(TCourseInfoRecord::getUserId, appUserId); + if(timeRequest.getType()!=null){ + eq.eq(TCourseInfoRecord::getType,timeRequest.getType()); + } + if (timeRequest.getLessionId()!=null){ + eq.eq(TCourseInfoRecord::getCourseId,timeRequest.getLessionId()); + + } + // 2.0其他记录 + List<TCourseInfoRecord> list = courseInfoRecordService.list(eq); + List<PurchaseRecordVo> list1=new ArrayList<>(); + for (TCourseInfoRecord tCourseInfoRecord : list) { + PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo(); + purchaseRecordVo.setPurchaseTime(new SimpleDateFormat("MM-dd HH:mm").format(tCourseInfoRecord.getTime())); + purchaseRecordVo.setPurchaseType(tCourseInfoRecord.getName()); + if(tCourseInfoRecord.getType()==1){ + purchaseRecordVo.setPurchaseAmount("+"+tCourseInfoRecord.getNum()); + }else { + purchaseRecordVo.setPurchaseAmount("-"+tCourseInfoRecord.getNum()); + } + list1.add(purchaseRecordVo); + } + purchaseRecordVoList.addAll(list1); + + if (purchaseRecordVoList.size() > 0 ){ + purchaseRecordVoList = purchaseRecordVoList.stream() + .filter(record -> { + String fieldValue = record.getPurchaseAmount(); + if (ToolUtil.isNotEmpty(timeRequest.getType())){ + switch (timeRequest.getType()){ + case 2: + return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-'; + case 1: + return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '+'; + default: + break; + } + } + return true; + }) + .collect(Collectors.toList()); + } purchaseRecordVoList = dealDataOfTime(purchaseRecordVoList); return purchaseRecordVoList; @@ -305,7 +385,7 @@ } @Override - public QuestionDetailsVo queryQuestionData() { + public List<QuestionIns> queryQuestionData() { return quesClient.getSysQuestionDetails(); } @@ -320,16 +400,11 @@ } @Override - public ExploreDatasVo queryIndexOfExplores(LonLatRequest llrequest) { - ExploreDatasVo datasVo = new ExploreDatasVo(); + public List<StoreInfo> queryIndexOfExplores(LonLatRequest llrequest) { GetAllNearbyStoreList getAllNearbyStoreList = new GetAllNearbyStoreList(); getAllNearbyStoreList.setLongitude(llrequest.getLongitude()); getAllNearbyStoreList.setLatitude(llrequest.getLatitude()); - List<StoreInfo> allNearbyStoreList = storeClient.getAllNearbyStoreList(getAllNearbyStoreList); - List<StoreLonLatList> allStoreLonLats = storeClient.getAllStoreLonLats(getAllNearbyStoreList); - datasVo.setStoreLists(allNearbyStoreList); - datasVo.setLonLatLists(allStoreLonLats); - return datasVo; + return storeClient.getAllNearbyStoreList(getAllNearbyStoreList); } @Override @@ -403,12 +478,14 @@ packagePayment.setInsertTime(new Date()); couPayClient.savePaymentCoursePackage(packagePayment); + Integer hour = couPayClient.getClassHour(request.getCourseConfigId()); + try { switch (request.getPayType()) { case 1: - return WeChatPayment(code,request.getPayAmount()); + return WeChatPayment(code,request.getPayAmount(),hour); case 2: - return AlipayPayment(code,request.getPayAmount()); + return AlipayPayment(code,request.getPayAmount(),hour); case 3: int i = PlaypaiGoldPayment(code,request); switch (i){ @@ -431,7 +508,7 @@ } - public ResultUtil WeChatPayment(String code,BigDecimal amount) throws Exception { + public ResultUtil WeChatPayment(String code,BigDecimal amount,Integer hour) throws Exception { ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, amount.toString(), "/base/coursePackage/wechatPaymentCallback", "APP", ""); if(weixinpay.getCode() == 200){ @@ -470,6 +547,8 @@ } if("SUCCESS".equals(s)){ coursePackagePayment.setPayStatus(2); + coursePackagePayment.setTotalClassHours(hour); + coursePackagePayment.setLaveClassHours(hour); coursePackagePayment.setOrderNumber(transaction_id); couPayClient.updatePaymentCoursePackage(coursePackagePayment); break; @@ -488,7 +567,7 @@ return weixinpay; } - public ResultUtil AlipayPayment(String code,BigDecimal amount){ + public ResultUtil AlipayPayment(String code,BigDecimal amount,Integer hour){ ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, amount.toString(), "/base/coursePackage/alipayPaymentCallback"); if(alipay.getCode() == 200){ @@ -524,6 +603,8 @@ } if("TRADE_SUCCESS".equals(s)){ coursePackagePayment.setPayStatus(2); + coursePackagePayment.setTotalClassHours(hour); + coursePackagePayment.setLaveClassHours(hour); coursePackagePayment.setOrderNumber(tradeNo); couPayClient.updatePaymentCoursePackage(coursePackagePayment); break; @@ -564,18 +645,86 @@ return ResultUtil.success(); } + /** + * + * @param stuId 学员id + * @param appUserId 用户id + * @param appointStatus 预约状态 0=全部 1=待上课 2=已完成 3=已取消 + * @param timeType 时间类型 0=全部 1=近一周 2=近一个月 3=近一年 + * @param search 课程名称 + * @return + */ @Override - public AppointmentRecordVo getAppointmentRecords(Integer stuId, Integer appUserId) { - AppointmentRecordVo recordVo = new AppointmentRecordVo(); - TStudent tStudent = this.baseMapper.selectOne(new QueryWrapper<TStudent>() - .eq("id",stuId ) - .eq("appUserId",appUserId)); - if (ToolUtil.isNotEmpty(tStudent)){ - recordVo.setStuId(tStudent.getId()); - recordVo.setStuName(tStudent.getName()); - recordVo.setAppointList(couPayClient.obtainStudentClassDetailsData(stuId)); + public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search,Integer pageNum) { + WeeksOfCourseRest courseRest = new WeeksOfCourseRest(); + courseRest.setAppUserId(appUserId); + courseRest.setStuId(stuId); + courseRest.setPageNum(pageNum); + List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest); + if (recordAppoints.size() > 0) { + if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) { + recordAppoints = recordAppoints.stream() + .filter(record -> record.getStatus().equals(appointStatus)) + .collect(Collectors.toList()); + } + if (ToolUtil.isNotEmpty(search)) { + recordAppoints = recordAppoints.stream() + .filter(record -> record.getCoursePackageName().contains(search)) + .collect(Collectors.toList()); + } + + if (ToolUtil.isNotEmpty(timeType) && timeType != 0) { + Date lastOfDate = DateUtil.getLastOfDate(); + switch (timeType) { + case 1: + Date lastWeekStartDate = DateUtil.getLastWeekStartDate(); + recordAppoints = recordAppoints.stream() + .filter(record -> { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Date time = sdf.parse(record.getTimeFrame().substring(11)); + return !time.before(lastWeekStartDate) && !time.after(lastOfDate); + } catch (ParseException e) { + return false; + } + }) + .collect(Collectors.toList()); + break; + case 2: + Date lastMonthStartDate = DateUtil.getLastMonthStartDate(); + recordAppoints = recordAppoints.stream() + .filter(record -> { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date time = sdf.parse(record.getTimeFrame().substring(11)); + return !time.before(lastMonthStartDate) && !time.after(lastOfDate); + } catch (ParseException e) { + return false; + } + }) + .collect(Collectors.toList()); + break; + case 3: + Date lastYearStartDate = DateUtil.getLastYearStartDate(); + recordAppoints = recordAppoints.stream() + .filter(record -> { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Date time = sdf.parse(record.getTimeFrame().substring(11)); + return !time.before(lastYearStartDate) && !time.after(lastOfDate); + } catch (ParseException e) { + return false; + } + }) + .collect(Collectors.toList()); + + break; + default: + break; + } + } } - return recordVo; + return recordAppoints; } @Override @@ -595,5 +744,115 @@ return null; } + /** + * + * @param space 1=升序/2=降序 + * @param cityCode 城市code + * @param latitude + * @param longitude + * @return + */ + @Override + public List<StoreDetailList> queryStoreList(Integer space,String cityCode,String latitude,String longitude,String search) { + StoreOfCitycodeResp citycodeResp = new StoreOfCitycodeResp(); + citycodeResp.setCityCode(cityCode); + citycodeResp.setLongitude(latitude); + citycodeResp.setLatitude(longitude); + List<StoreDetailList> queryStoreList = storeClient.getQueryStoreList(citycodeResp); + if (queryStoreList.size() > 0){ + if (ToolUtil.isEmpty(space) || space == 2){ + queryStoreList = queryStoreList.stream() + .sorted(Comparator.comparing(StoreDetailList::getStoreDistance).reversed()) + .collect(Collectors.toList()); + }else { + queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList()); + } + if (ToolUtil.isNotEmpty(search)){ + queryStoreList = queryStoreList.stream().filter(o -> o.getStoreName().contains(search)).collect(Collectors.toList()); + } + + } + return queryStoreList; + } + + @Override + public StoreDetailsVo getStoreDetail(Integer storeId) { + Store store = storeClient.queryStoreById(storeId); + StoreDetailsVo detailsVo = new StoreDetailsVo(); + String realPicture = store.getRealPicture(); + if (ToolUtil.isNotEmpty(realPicture)){ + String[] split = realPicture.split(","); + detailsVo.setImages(Arrays.asList(split)); + } + detailsVo.setStoreId(store.getId()); + detailsVo.setStoreName(store.getName()); + detailsVo.setStoreAddress(store.getAddress()); + detailsVo.setStoreTime(store.getStartTime() + "至" +store.getEndTime()); + detailsVo.setStoreInfo(store.getIntroduce()); + detailsVo.setLon(store.getLon()); + detailsVo.setLat(store.getLat()); + detailsVo.setPhone(store.getPhone()); + detailsVo.setVenueList(steClient.getAppUserSiteList(storeId)); + List<StoreOfCourseVo> storeOfCourseList = culisClient.getStoreOfCourseList(storeId); + System.out.println(storeOfCourseList); + detailsVo.setCourseVoList(storeOfCourseList); + return detailsVo; + } + + @Override + public ResultUtil commitEditStudentInfo(StuEditInfoReq stu, Integer userIdFormRedis) { + TStudent tStudent = this.baseMapper.selectOne(new LambdaQueryWrapper<TStudent>() + .eq(TStudent::getId,stu.getId()) + .eq(TStudent::getAppUserId,userIdFormRedis)); + if (ToolUtil.isEmpty(tStudent)){ + ResultUtil.error("会员信息不存在!"); + } + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + tStudent.setHeadImg(stu.getHeadImg()); + tStudent.setName(stu.getName()); + tStudent.setPhone(ToolUtil.isEmpty(stu.getPhone()) ? "":stu.getPhone()); + try { + tStudent.setBirthday(simpleDateFormat.parse(stu.getBirthday())); + } catch (ParseException e) { + ResultUtil.runErr(); + } + tStudent.setSex(stu.getSex()); + tStudent.setHeight(stu.getHeight()); + tStudent.setWeight(stu.getWeight()); + tStudent.setIdCard(ToolUtil.isEmpty(stu.getIdCard()) ? "" : stu.getIdCard()); + this.baseMapper.updateById(tStudent); + return ResultUtil.success(); + } + + @Override + public List<TStudentDto> listAll(StudentSearch search) { + return this.baseMapper.selectAll(search); + } + + @Override + public TStudentDto listOne(Integer id) { + return this.baseMapper.selectWebOne(id); + } + + @Override + public void createHistory(CreateHistoryDto createHistoryDto) { + this.baseMapper.createHistory(createHistoryDto); + } + + @Override + public List<GetHistoryDto> getHistory() { + return this.baseMapper.getHistory(); + } + + @Override + public Integer getGiftSelect(GiftSearchDto giftSearchDto) { + return this.baseMapper.getGiftSelect(giftSearchDto); + } + + @Override + public List<Map<String, Object>> queryCom(Integer id) { + return this.baseMapper.queryCom(id); + } + } -- Gitblit v1.7.1