From 6af0c7434178ca41e727c700af8174201a865de9 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 11:55:29 +0800
Subject: [PATCH] 10.31.8
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 131 +++++++++++++++++++++++++++++++++++--------
1 files changed, 106 insertions(+), 25 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 1da3976..c9fef86 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,11 +1,11 @@
package com.dsh.account.service.impl;
+import com.alipay.api.response.AlipayTradeQueryResponse;
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;
@@ -24,7 +24,6 @@
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;
@@ -37,7 +36,7 @@
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.model.vo.userBenefitDetail.Goods;
+import com.dsh.account.service.TCourseInfoRecordService;
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +45,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -112,6 +112,9 @@
@Resource
private CourseListClient culisClient;
+ @Autowired
+ private TCourseInfoRecordService courseInfoRecordService;
+
@Override
@@ -134,11 +137,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);
//同步信息到参赛人员信息中
@@ -241,6 +254,7 @@
getStuSourseList.setStartTime(startTime);
getStuSourseList.setEndTime(endTime);
getStuSourseList.setAppUserId(appUserId);
+ // 报名赛事
List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(getStuSourseList);
purchaseRecordVoList.addAll(stuSourseList);
@@ -257,6 +271,7 @@
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>()
@@ -268,9 +283,34 @@
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()
@@ -278,15 +318,15 @@
String fieldValue = record.getPurchaseAmount();
if (ToolUtil.isNotEmpty(timeRequest.getType())){
switch (timeRequest.getType()){
- case 1:
- return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
case 2:
+ return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
+ case 1:
return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '+';
default:
break;
}
}
- return false;
+ return true;
})
.collect(Collectors.toList());
}
@@ -439,12 +479,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){
@@ -467,7 +509,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){
@@ -506,6 +548,8 @@
}
if("SUCCESS".equals(s)){
coursePackagePayment.setPayStatus(2);
+ coursePackagePayment.setTotalClassHours(hour);
+ coursePackagePayment.setLaveClassHours(hour);
coursePackagePayment.setOrderNumber(transaction_id);
couPayClient.updatePaymentCoursePackage(coursePackagePayment);
break;
@@ -524,7 +568,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){
@@ -542,29 +586,35 @@
if(coursePackagePayment.getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+
+ if(resultUtil.getCode().equals("10000") && coursePackagePayment.getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
- if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
+// 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_CLOSED".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus) || num == 10){
coursePackagePayment.setState(3);
couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
break;
}
- if("TRADE_SUCCESS".equals(s)){
+ if("TRADE_SUCCESS".equals(tradeStatus)){
coursePackagePayment.setPayStatus(2);
+ coursePackagePayment.setTotalClassHours(hour);
+ coursePackagePayment.setLaveClassHours(hour);
coursePackagePayment.setOrderNumber(tradeNo);
couPayClient.updatePaymentCoursePackage(coursePackagePayment);
break;
}
- if("WAIT_BUYER_PAY".equals(s)){
+ if("WAIT_BUYER_PAY".equals(tradeStatus)){
num++;
}
}
@@ -610,10 +660,11 @@
* @return
*/
@Override
- public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search) {
+ 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) {
@@ -746,7 +797,7 @@
detailsVo.setLon(store.getLon());
detailsVo.setLat(store.getLat());
detailsVo.setPhone(store.getPhone());
- detailsVo.setVenueList(steClient.getAppUserSiteList());
+ detailsVo.setVenueList(steClient.getAppUserSiteList(storeId));
List<StoreOfCourseVo> storeOfCourseList = culisClient.getStoreOfCourseList(storeId);
System.out.println(storeOfCourseList);
detailsVo.setCourseVoList(storeOfCourseList);
@@ -778,5 +829,35 @@
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