java/PlayPai.git

			@@ -4,8 +4,12 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.dsh.course.entity.*;
			import com.dsh.course.feignclient.account.AppUserClient;
			import com.dsh.course.feignclient.account.StudentClient;
			import com.dsh.course.feignclient.account.model.AppUser;
			import com.dsh.course.feignclient.account.model.Student;
			import com.dsh.course.feignclient.model.*;
			import com.dsh.course.feignclient.other.StoreClient;
			import com.dsh.course.feignclient.other.model.Store;
			import com.dsh.course.model.BaseVo;
			import com.dsh.course.model.dto.DiscountJsonDto;
			import com.dsh.course.model.vo.CourseDetailRequest;
			@@ -35,7 +39,10 @@
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.util.*;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			@Api
			@@ -66,7 +73,8 @@
			@Autowired
			private TCourseService tcService;


			@Resource
			private StudentClient studentClient;

			@Autowired
			private TCoursePackageTypeService coursePackageTypeService;
			@@ -82,6 +90,9 @@
			@Resource
			private AppUserClient auClitn;

			@Resource
			private StoreClient sreClient;

			private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");

			/**
			@@ -89,11 +100,13 @@
			* @param stuId 学员id
			* @return 课包列表
			*/
			@ResponseBody
			@PostMapping("/base/coursePack/queryPayment")
			public List<StuCourseResp> getStuCoursePackagePayment(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
			public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId){
			List<StuCourseResp> resps = new ArrayList<>();
			Student student = studentClient.queryStudentById(stuId);
			List<TCoursePackagePayment> byUserId = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
			.eq("appUserId",appUserId)
			.eq("appUserId",student.getAppUserId())
			.eq("studentId",stuId));

			if (byUserId.size() > 0 ){
			@@ -105,6 +118,8 @@
			resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
			resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
			resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
			String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");
			resp.setPeriodOfValidity(afterDayDate);
			resps.add(resp);
			}
			}
			@@ -115,6 +130,7 @@
			*
			* 获取发布的课包列表
			*/
			@ResponseBody
			@PostMapping("/base/coursePack/storeOfCourse")
			public List<CourseOfStoreVo> getStuCourseWithStores(@RequestBody WeeksOfCourseRest courseRest){
			List<CourseOfStoreVo> course = new ArrayList<>();
			@@ -131,20 +147,24 @@
			if (list.size() > 0){
			for (TCoursePackagePayment tCoursePackagePayment : list) {
			TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
			CoursePackagePaymentConfig paymentConfig = icppcService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
			.eq("coursePackageId",tCoursePackage.getId() )
			.eq("classHours",tCoursePackagePayment.getClassHours()));
			// 获取课程有效结束时间，判断查询的日期parse 是否在有效期范围内
			Date expirationDate = DateTimeHelper.getExpirationDate(tCoursePackagePayment.getInsertTime(),tCoursePackage.getValidDays());
			String classWeeks = tCoursePackage.getClassWeeks();
			if (expirationDate.after(parse) && StrUtils.dealStrToList(classWeeks).contains(DateTimeHelper.getDayOfWeek(parse))){
			CourseOfStoreVo storeVo = new CourseOfStoreVo();
			storeVo.setCourseId(tCoursePackage.getId());
			// TODO: 2023/7/20 查询课包对应门店信息
			// storeVo.setCourseName();
			// storeVo.setClassStartTime();
			// storeVo.setClassEndTime();
			// storeVo.setStoreId();
			// storeVo.setStoreName();
			// storeVo.setLat();
			// storeVo.setLon();
			storeVo.setCourseName(tCoursePackage.getName());
			storeVo.setClassStartTime(tCoursePackage.getClassStartTime());
			storeVo.setClassEndTime(tCoursePackage.getClassEndTime());
			storeVo.setStoreId(tCoursePackage.getStoreId());
			Store store = sreClient.queryStoreById(tCoursePackage.getStoreId());
			storeVo.setStoreAddress(store.getAddress());
			storeVo.setLat(store.getLat());
			storeVo.setLon(store.getLon());
			storeVo.setCoursePrice(ToolUtil.isEmpty(paymentConfig.getCashPayment()) ? (double) paymentConfig.getPlayPaiCoin():paymentConfig.getCashPayment());
			course.add(storeVo);
			}
			}
			@@ -359,12 +379,13 @@
			}

			@PostMapping("/base/coursePack/allAmountPayRecordOfUser")
			public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody Integer appUserId){
			public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo billingDataRequestVo){
			return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
			.eq("appUserId",appUserId)
			.eq("appUserId",billingDataRequestVo.getAppUserId())
			.notIn("payType",3)
			.eq("payStatus",2)
			.eq("state",1));
			.eq("state",1)
			.between("insertTime",billingDataRequestVo.getMonthStart(),billingDataRequestVo.getMonthEnd()));
			}