java/PlayPai.git

			@@ -9,9 +9,11 @@
			import com.dsh.activity.feignclient.course.model.CoursePackage;
			import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig;
			import com.dsh.activity.feignclient.model.*;
			import com.dsh.activity.feignclient.other.OperatorClient;
			import com.dsh.activity.feignclient.other.StoreClient;
			import com.dsh.activity.feignclient.other.model.Store;
			import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
			import com.dsh.activity.feignclient.other.model.TOperatorCity;
			import com.dsh.activity.model.CoachChangeStateVO;
			import com.dsh.activity.model.PointMerchandiseIncomeVo;
			import com.dsh.activity.model.PointMerchandiseVo;
			@@ -116,6 +118,10 @@
			byId.setVerificationUserId(dto.getVerificationUserId());
			return userPointsMerchandiseService.updateById(byId);
			}
			@Autowired
			private OperatorClient operatorClient;
			@Resource
			private CouponCityService cityService;
			@ResponseBody
			@PostMapping("/base/pointMerchars/ticketList")
			public List<Map<String,Object>> ticketList(@RequestBody IntegralGoodsOfSearch ofSearch){
			@@ -155,6 +161,49 @@
			}
			result.add(map);
			}
			if (Integer.parseInt(String.valueOf(map.get("useScope"))) == 1){
			result.add(map);
			}
			if (Integer.parseInt(String.valueOf(map.get("useScope"))) == 2){
			// 获取到优惠券id 查询这个优惠券指定了哪些城市
			Integer id1 = Integer.parseInt(String.valueOf(map.get("id")));
			// 获取到运营商管理的省和市
			List<TOperatorCity> cityByOperatorId = operatorClient.getCityByOperatorId(ofSearch.getObjId());
			// 拿到运营商市的code集合
			List<String> collect1 = cityByOperatorId.stream().filter(t -> t.getPid() != 0)
			.map(tOperatorCity -> Integer.toString(tOperatorCity.getCode()))
			.collect(Collectors.toList());
			List<CouponCity> couponId = cityService.list(new QueryWrapper<CouponCity>().eq("couponId", id1));
			// 先判断优惠券管理的市运营商是否有
			List<String> collect3 = couponId.stream().map(CouponCity::getCityCode)
			.collect(Collectors.toList());
			// 优惠券指定的省
			List<String> collect4 = couponId.stream().map(CouponCity::getCityCode)
			.collect(Collectors.toList());
			if (!Collections.disjoint(collect3, collect4)){
			result.add(map);
			}else{
			// 如果没有交集那么还需要判断运营商是否管理了整个省


			}
			}
			if (Integer.parseInt(String.valueOf(map.get("useScope"))) == 3){
			// 获取到优惠券id 查询这个优惠券指定了哪些门店
			Integer id3 = Integer.parseInt(String.valueOf(map.get("id")));
			// 当前运营商管理的门店ids
			List<Integer> storeIds = ofSearch.getStoreIds();
			// 优惠券指定的门店
			List<Integer> collect5 = cstoreService.list(new QueryWrapper<CouponStore>().eq("couponId",id3)
			.in("storeId", storeIds)).stream().map(CouponStore::getStoreId)
			.collect(Collectors.toList());
			// 判断两个集合是否相交
			// 比较两个集合中是否有相同的元素；当两个集合中没有相同元素时返回true，
			// 当有相同元素时返回false。
			if (!Collections.disjoint(collect5, storeIds)){
			result.add(map);
			}
			}
			}
			} else {
			result=result1;
			@@ -193,10 +242,11 @@
			String endTime = (String) stringObjectMap.get("endTime");
			stringObjectMap.put("timeValue",startTime + "至"+endTime);
			int count1 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
			.eq(UserPointsMerchandise::getPointsMerchandiseId, o));
			int count2 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
			.eq(UserPointsMerchandise::getPointsMerchandiseId, o)
			.eq(UserPointsMerchandise::getStatus,2));
			int count2 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
			.eq(UserPointsMerchandise::getPointsMerchandiseId, o)
			);
			stringObjectMap.put("hasExchangeQty",count1);
			stringObjectMap.put("hasPickQty",count2);

			@@ -719,9 +769,12 @@
			if (merchandise.getRedemptionMethod() == 1){
			detailsResponse.setExchangeType(1);
			detailsResponse.setIntegral(merchandise.getIntegral());
			}else {
			}else if (merchandise.getRedemptionMethod() == 2){
			detailsResponse.setExchangeType(2);
			detailsResponse.setIntegral(merchandise.getIntegral());
			detailsResponse.setCash(merchandise.getCash());
			}else if (merchandise.getRedemptionMethod() == 3){
			detailsResponse.setExchangeType(3);
			detailsResponse.setCash(merchandise.getCash());
			}
			detailsResponse.setStartTime(simpleDateFormat.format(merchandise.getStartTime()));
			@@ -791,9 +844,10 @@

			// Print the result
			if (isSameDate) {
			detailsResponse.setUseStatus(3);

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


			@@ -860,6 +914,7 @@
			if (c==null){
			continue;
			}

			ExchangeDetailsResponse detailsResponse = new ExchangeDetailsResponse();
			detailsResponse.setDetailsId(Long.valueOf(c.getId()));
			detailsResponse.setGoodName(c.getName());
			@@ -879,6 +934,8 @@


			}
			Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();
			Collections.sort(responses, comparator);
			detailsVo.setDetailsResponses(responses);

			}
			@@ -1231,6 +1288,15 @@

			}

			//拿到积分商品现金的消费记录
			@ResponseBody
			@PostMapping("/base/pointMerchars/getConsumeDetails")
			public List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo){
			return upmseService.getConsumeDetails(requestVo);



			}


			public int dealTimeStatus(String startTime, String endTime){
			@@ -1356,7 +1422,16 @@

			@PostMapping("/base/pointMerchars/queryPointMerchaseById")
			public PointsMerchandise queryPointMerchaseById(@RequestBody Integer id){
			return pmdsService.getById(id);
			PointsMerchandise byId = pmdsService.getById(id);
			int count1 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
			.eq(UserPointsMerchandise::getPointsMerchandiseId, byId.getId())
			.eq(UserPointsMerchandise::getStatus,2));
			int count2 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
			.eq(UserPointsMerchandise::getPointsMerchandiseId, byId.getId())
			);
			byId.setPickUpQuantity3(count2);
			byId.setPickUpQuantity4(count1);
			return byId;
			}

			@PostMapping("/base/pointMerchars/getshopName")
			@@ -1519,7 +1594,7 @@
			@PostMapping("/base/pointMerchars/add")
			public Integer add(@RequestBody PointsMerchandise pointsMerchandise){
			Integer storeId = pointsMerchandise.getShelves();
			pointsMerchandise.setShelves(2);
			pointsMerchandise.setShelves(1);
			boolean save = pmdsService.save(pointsMerchandise);
			if(save && ToolUtil.isNotEmpty(storeId) && pointsMerchandise.getType()==2){
			PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();