java/PlayPai.git

			@@ -10,11 +10,9 @@
			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.SiteClient;
			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.feignclient.other.model.*;
			import com.dsh.activity.model.CoachChangeStateVO;
			import com.dsh.activity.model.PointMerchandiseIncomeVo;
			import com.dsh.activity.model.PointMerchandiseVo;
			@@ -27,6 +25,7 @@
			import com.dsh.activity.util.*;
			import io.swagger.models.auth.In;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.util.StringUtils;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			@@ -78,6 +77,8 @@

			@Resource
			private CouponCityService ccityService;
			@Autowired
			private SiteClient siteClient;


			@Resource
			@@ -297,12 +298,11 @@
			List<IntegralCommodity> commodity = new ArrayList<>();

			Map<String, String> geocode = gdMapGeocodingUtil.geocode(location.getLon(), location.getLat());
			if(null == geocode){
			return new ArrayList<>();
			}
			String provinceCode = geocode.get("provinceCode");
			String cityCode = geocode.get("cityCode");


			// if(null != geocode) {

			List<Store> stores = storeClient.queryStoreList(new QueryStoreList(provinceCode, cityCode));
			Store s = null;
			Double d = 0D;
			@@ -314,14 +314,7 @@
			d = wgs84;
			}
			}
			// }

			// List<PointsMerchandiseCity> cityCode1 = pmdsCityService.list(new QueryWrapper<PointsMerchandiseCity>().eq("cityCode", cityCode));
			List<Integer> cIds = new ArrayList<>();
			// for (PointsMerchandiseCity pointsMerchandiseCity : cityCode1) {
			// cIds.add(pointsMerchandiseCity.getPointsMerchandiseId());
			// }

			List<PointsMerchandiseStore> storesids = pointsMerchandiseStoreService.list(new QueryWrapper<PointsMerchandiseStore>().eq("storeId", s.getId()));
			for (PointsMerchandiseStore storesid : storesids) {
			cIds.add(storesid.getPointsMerchandiseId());
			@@ -934,14 +927,11 @@
			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) &&
			@@ -1633,6 +1623,9 @@
			case 3:
			infoOneVo.setExchangeArea("指定门店");
			break;
			case 4:
			infoOneVo.setExchangeArea("指定场地");
			break;
			default:
			break;
			}
			@@ -1672,12 +1665,16 @@
			.eq("pointsMerchandiseId", id));
			if (list.size() > 0) {
			List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
			List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).collect(Collectors.toList());
			List<Store> stores = stoClient.queryStoreByIds(collect);
			if (stores.size() > 0) {
			int a = 0;
			for (Store store : stores) {
			StoreVos storeVos1 = new StoreVos();
			storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
			if (store.getOperatorId() == 0) {
			if (store.getOperatorId()==null){
			storeVos1.setNum2("平台");
			}else if (store.getOperatorId() == 0) {
			storeVos1.setNum2("平台");
			} else {

			@@ -1685,12 +1682,18 @@
			}
			storeVos1.setNum3(store.getName());
			storeVos1.setNum4(store.getIds());
			if (collect1.get(a)!=null){
			Site site = siteClient.querySiteById(collect1.get(a));
			storeVos1.setNum5(site.getName());
			}
			storeVos1.setNum4(store.getIds());
			storeVos.add(storeVos1);
			}
			}
			}
			return storeVos;
			}



			@ResponseBody
			@@ -1753,6 +1756,20 @@
			public Boolean addOther(@RequestBody String pam) {
			Boolean save = false;
			String[] split = pam.split("_");
			if (split.length>2){
			if (StringUtils.hasLength(split[2])){
			for (String s : split[2].split(",")) {
			PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
			pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
			pointsMerchandiseStore.setSiteId(Integer.valueOf(s));
			Site site = siteClient.querySiteById(Integer.valueOf(s));
			pointsMerchandiseStore.setStoreId(site.getStoreId());
			save = pmdstoService.save(pointsMerchandiseStore);
			}
			// 这个门票是选择的场地
			return save;
			}
			}
			for (String s : split[1].split(",")) {
			PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
			pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
			@@ -1761,6 +1778,7 @@
			}
			return save;
			}


			@PostMapping("/base/pointMerchars/addCitys")
			public Boolean addCitys(@RequestBody ArrayList<Map<String, String>> objects) {
			@@ -1854,6 +1872,8 @@
			List<Integer> ids = queryDataFee.getIds();
			if (ids.size() == 0) {
			ids.add(-1);
			}else{

			}
			List<PointsMerchandise> list1 = pmdsService.list(new LambdaQueryWrapper<PointsMerchandise>().eq(PointsMerchandise::getRedemptionMethod, 3));
			LambdaQueryWrapper<UserPointsMerchandise> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();