java/PlayPai.git

			@@ -89,12 +89,23 @@
			* 门票上下架 state=1 上架 state=2 下架
			*/
			@RequestMapping("/base/pointMerchars/changeState")
			public Object changeState(@RequestBody CoachChangeStateVO dto){
			return pmdsService.changeState(dto);
			public void changeState(@RequestBody CoachChangeStateVO dto){


			pmdsService.changeState(dto);
			}
			/**
			* 门票核销
			*/

			@RequestMapping("/base/course/changeState")
			@ResponseBody
			public Object changeState(@RequestBody CourseChangeStateDTO dto){
			return userPointsMerchandiseService.changeState(dto);
			}



			@RequestMapping("/base/pointMerchars/writeOff")
			public Object writeOff(@RequestBody WriteOffDTO dto){
			UserPointsMerchandise byId = userPointsMerchandiseService.getById(dto.getId());
			@@ -126,7 +137,26 @@
			result.add(map);
			}
			}
			}else {
			}else if(ofSearch.getObjType()==2){
			for (Map<String, Object> map : result1) {
			// 拿到当前运营商下的门店的门票
			List<PointsMerchandiseStore> id = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>().in("storeId",ofSearch.getStoreIds()));
			// 拿到积分商品id集合
			List<Integer> collect = id.stream().map(PointsMerchandiseStore::getPointsMerchandiseId).collect(Collectors.toList());
			if(collect.size()==0){
			collect.add(-1);
			}
			Integer temp =(Integer)map.get("id");
			if (collect.contains(temp)){
			if(id.size()>1){
			map.put("size",1);
			}else {
			map.put("size",0);
			}
			result.add(map);
			}
			}
			} else {
			result=result1;
			}
			if (result.size() > 0){
			@@ -456,18 +486,28 @@
			}
			return detailsVo;
			}


			@Autowired
			private UserCouponService userCouponService;
			@PostMapping("/base/pointMerchars/getGoodDetails")
			public ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest){
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			ProductDetailsVo detailsVo = new ProductDetailsVo();
			PointsMerchandise merchandise = pmdsService.getById(detailRequest.getGoodId());
			detailsVo.setCardType(merchandise.getCardType());



			if (merchandise!=null) {
			detailsVo.setCardType(merchandise.getCardType());
			}
			switch (detailRequest.getGoodsType()){
			case 2:
			// 课包
			CoursePackage coursePackage = cpClient.queryCoursePackageById(merchandise.getCoursePackageId());

			detailsVo.setGoodId(coursePackage.getId());
			// detailsVo.setGoodId(coursePackage.getId());
			detailsVo.setGoodId(merchandise.getId());
			List<String> list1 = new ArrayList<>();
			list1.add(coursePackage.getCoverDrawing());
			list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));
			@@ -601,10 +641,17 @@
			});
			detailsVo.setGoodName(coupon.getName());
			detailsVo.setBelongsScope(coupon.getUserPopulation());
			int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
			.eq("pointsMerchandiseId",merchandise.getId() ));
			detailsVo.setRedeemedNum(couponNums);
			detailsVo.setResidueNum(Math.max(coupon.getQuantityIssued() - couponNums, 0));
			// int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
			// .eq("pointsMerchandiseId",merchandise.getId() ));



			int couponCounts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
			// detailsVo.setRedeemedNum(coupon.getPickUpQuantity());
			detailsVo.setRedeemedNum(couponCounts);

			detailsVo.setResidueNum(Math.max(coupon.getQuantityIssued() - couponCounts, 0));

			detailsVo.setPerLimit(coupon.getPickUpQuantity());
			detailsVo.setExchangeType(coupon.getRedemptionMethod());
			if (coupon.getRedemptionMethod() == 1){
			@@ -654,6 +701,9 @@
			if (pointsMerchandises.size() > 0 ){
			for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {
			PointsMerchandise merchandise = pmdsService.getById(pointsMerchandise.getPointsMerchandiseId());
			if (merchandise==null){
			continue;
			}
			ExchangeDetailsResponse detailsResponse = new ExchangeDetailsResponse();
			detailsResponse.setDetailsId(pointsMerchandise.getId());
			detailsResponse.setGoodName(merchandise.getName());
			@@ -705,6 +755,90 @@
			}

			}


			if (merchandise.getCardType()==1){
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pointsMerchandise.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 1);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
			String endDate = dateFormat.format(end);
			detailsResponse.setStartTime(startDate);
			detailsResponse.setEndTime(startDate);

			Date now = new Date();
			Calendar cal1 = Calendar.getInstance();
			cal1.setTime(pointsMerchandise.getInsertTime());

			Calendar cal2 = Calendar.getInstance();
			cal2.setTime(now);

			// Compare the year, month, and day of the two Calendar instances
			boolean isSameDate = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
			cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&
			cal1.get(Calendar.DAY_OF_MONTH) == cal2.get(Calendar.DAY_OF_MONTH);

			// Print the result
			if (isSameDate) {
			detailsResponse.setUseStatus(3);
			} else {
			System.out.println("The two dates do not have the same date.");
			}


			} else if (merchandise.getCardType()==2) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pointsMerchandise.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 31);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
			String endDate = dateFormat.format(end);
			detailsResponse.setStartTime(startDate);
			detailsResponse.setEndTime(endDate);

			Date now = new Date();
			if (now.after(end)){
			detailsResponse.setUseStatus(3);
			}

			} else if (merchandise.getCardType()==3) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pointsMerchandise.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 93);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
			String endDate = dateFormat.format(end);
			detailsResponse.setStartTime(startDate);
			detailsResponse.setEndTime(endDate);

			Date now = new Date();
			if (now.after(end)){
			detailsResponse.setUseStatus(3);
			}

			} else if (merchandise.getCardType()==4) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pointsMerchandise.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 372);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
			String endDate = dateFormat.format(end);
			detailsResponse.setStartTime(startDate);
			detailsResponse.setEndTime(endDate);

			Date now = new Date();
			if (now.after(end)){
			detailsResponse.setUseStatus(3);
			}

			}


			}
			responses.add(detailsResponse);
			}
			@@ -750,6 +884,95 @@
			return 0; // 保持原顺序
			}
			});




			if (pmdsServiceById.getCardType()==1){
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pmdsServiceById.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 1);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
			String endDate = dateFormat.format(end);
			pmdsServiceById.setStartTime(pmdsServiceById.getInsertTime());
			pmdsServiceById.setEndTime(pmdsServiceById.getInsertTime());

			Date now = new Date();
			Calendar cal1 = Calendar.getInstance();
			cal1.setTime(pmdsServiceById.getInsertTime());

			Calendar cal2 = Calendar.getInstance();
			cal2.setTime(now);

			// Compare the year, month, and day of the two Calendar instances
			boolean isSameDate = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
			cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&
			cal1.get(Calendar.DAY_OF_MONTH) == cal2.get(Calendar.DAY_OF_MONTH);

			// Print the result
			if (isSameDate) {
			detailsVo.setUseType(3);
			} else {
			System.out.println("The two dates do not have the same date.");
			}


			} else if (pmdsServiceById.getCardType()==2) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pmdsServiceById.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 31);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
			String endDate = dateFormat.format(end);
			detailsVo.setStartTime(startDate);
			detailsVo.setEndTime(endDate);

			Date now = new Date();
			if (now.after(end)){
			detailsVo.setUseType(3);
			}

			} else if (pmdsServiceById.getCardType()==3) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pmdsServiceById.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 93);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
			String endDate = dateFormat.format(end);
			detailsVo.setStartTime(startDate);
			detailsVo.setEndTime(endDate);

			Date now = new Date();
			if (now.after(end)){
			detailsVo.setUseType(3);
			}

			} else if (pmdsServiceById.getCardType()==4) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pmdsServiceById.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 372);
			Date end = calendar.getTime();
			String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
			String endDate = dateFormat.format(end);
			detailsVo.setStartTime(startDate);
			detailsVo.setEndTime(endDate);

			Date now = new Date();
			if (now.after(end)){
			detailsVo.setUseType(3);
			}

			}





			break;
			case 2:
			CoursePackage coursePackage = cpClient.queryCoursePackageById(pmdsServiceById.getCoursePackageId());
			@@ -840,6 +1063,7 @@
			upmseService.updateById(merchandise);
			}

			@ResponseBody
			@PostMapping("/base/pointMerchars/queryUserPointMerchaseByCode")
			public List<UserPointsMerchandise> queryUserPointMerchaseByCode(@RequestBody String code){
			return upmseService.list(new QueryWrapper<UserPointsMerchandise>()