java/PlayPai.git

			@@ -13,6 +13,7 @@
			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.StoreInfoDto;
			import com.dsh.activity.feignclient.other.model.TOperatorCity;
			import com.dsh.activity.model.CoachChangeStateVO;
			import com.dsh.activity.model.PointMerchandiseIncomeVo;
			@@ -294,12 +295,12 @@
			cIds.add(pointsMerchandiseCity.getPointsMerchandiseId());
			}

			if (cIds.size()>0) {
			// if (cIds.size()>0) {

			List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
			.eq("state", 1)
			.eq("shelves", 1).in("id", cIds)
			.gt("endTime", new Date()));
			.eq("shelves", 1)
			.gt("endTime", new Date()).last("ORDER BY sort desc,insertTime desc"));
			if (merchandises.size() > 0){
			for (PointsMerchandise merchandise : merchandises) {
			IntegralCommodity integralCommodity = new IntegralCommodity();
			@@ -308,9 +309,10 @@
			integralCommodity.setCommodityName(merchandise.getName());
			integralCommodity.setCommodityPrice(merchandise.getPrice());
			integralCommodity.setGoodsType(merchandise.getType());
			integralCommodity.setSort(merchandise.getSort());
			commodity.add(integralCommodity);
			}
			}
			// }
			}

			System.out.println(commodity);
			@@ -880,10 +882,10 @@

			// Print the result
			if (isSameDate) {

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

			}


			@@ -903,7 +905,7 @@
			detailsResponse.setUseStatus(3);
			}

			} else if (merchandise.getCardType()==3) {
			} else if (merchandise.getCardType()==3){
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(pointsMerchandise.getInsertTime());
			@@ -980,6 +982,9 @@
			}


			@Autowired
			private PointsMerchandiseStoreService storeService;

			@ResponseBody
			@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
			public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId){
			@@ -987,7 +992,10 @@
			PointDetailsVo detailsVo = new PointDetailsVo();
			UserPointsMerchandise byId = upmseService.getById(speMercharsId);


			if (ToolUtil.isNotEmpty(byId)){
			List<PointsMerchandiseStore> stores = storeService.list(new QueryWrapper<PointsMerchandiseStore>().eq("pointsMerchandiseId", byId.getPointsMerchandiseId()));

			PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
			// 2.0
			detailsVo.setCardType(pmdsServiceById.getCardType());
			@@ -1006,6 +1014,22 @@
			case 3:
			List<String> list10 = Arrays.asList(StrUtils.splitStr2StrArr(pmdsServiceById.getProductImages(), ","));
			ArrayList<String> list2 = new ArrayList<>(list10);


			SimpleDateFormat dateFormat5 = new SimpleDateFormat("yyyy-MM-dd");


			for (PointsMerchandiseStore store : stores) {
			StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(store.getStoreId());
			detailsVo.setBelongs(courseOfStore.getStoreName());
			}

			String format = dateFormat5.format(byId.getInsertTime());
			detailsVo.setOrderTime(format);




			list2.add(pmdsServiceById.getCover());
			detailsVo.setPics(list2);
			Collections.sort(detailsVo.getPics(), (s1, s2) -> {
			@@ -1054,6 +1078,9 @@

			} else if (pmdsServiceById.getCardType()==2) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");



			Calendar calendar = Calendar.getInstance();
			calendar.setTime(byId.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 31);
			@@ -1070,6 +1097,9 @@

			} else if (pmdsServiceById.getCardType()==3) {
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");



			Calendar calendar = Calendar.getInstance();
			calendar.setTime(byId.getInsertTime());
			calendar.add(Calendar.DAY_OF_MONTH, 93);
			@@ -1157,9 +1187,13 @@
			detailsVo.setUseType(2);
			}else {
			detailsVo.setUseType(1);
			detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
			StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getVerifiStoreId());
			detailsVo.setWriteOffName(courseOfStore.getStoreName());
			if (pmdsServiceById.getType()!=2) {
			detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
			}
			if (byId.getStoreId()!=null) {
			StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
			detailsVo.setWriteOffName(courseOfStore.getStoreName());
			}
			}
			switch (pmdsServiceById.getUseScope()){
			case 1:
			@@ -1216,25 +1250,26 @@
			detailsVo.setIntegral(coupon.getIntegral().intValue());
			detailsVo.setCash(coupon.getCash());
			}
			// if (coupon.getUseScope() == 1){
			// detailsVo.setExchangeAddrType(1);
			// detailsVo.setBelongs("全国通用");
			// }else if (coupon.getUseScope() == 2){
			// detailsVo.setExchangeAddrType(2);
			// List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>()
			// .eq(CouponCity::getCouponId, coupon.getId()));
			// if (list.size() > 0){
			// detailsVo.setBelongs(list.get(0).getProvince()+"\|"+list.get(0).getCity() + "用户可用");
			// }
			// }else {
			// detailsVo.setExchangeAddrType(3);
			// List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>()
			// .eq("couponId",coupon.getId() ));
			// StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId());
			// detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
			// }
			// detailsVo.setStartTime(format.format(coupon.getStartTime()));
			// detailsVo.setEndTime(format.format(coupon.getEndTime()));
			if (coupon.getUseScope() == 1){
			detailsVo.setExchangeAddrType(1);
			detailsVo.setBelongs("全国通用");
			}else if (coupon.getUseScope() == 2){
			detailsVo.setExchangeAddrType(2);
			List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>()
			.eq(CouponCity::getCouponId, coupon.getId()));
			if (list.size() > 0){
			detailsVo.setBelongs(list.get(0).getProvince()+"\|"+list.get(0).getCity() + "用户可用");
			}
			}else {
			detailsVo.setExchangeAddrType(3);
			List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>()
			.eq("couponId",coupon.getId() ));
			StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId());
			detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
			}
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			detailsVo.setStartTime(format.format(coupon.getStartTime()));
			detailsVo.setEndTime(format.format(coupon.getEndTime()));

			detailsVo.setContents(coupon.getIllustrate());
			detailsVo.setGoodType(4);