java/PlayPai.git

			@@ -13,16 +13,14 @@
			import com.dsh.course.feignClient.activity.CouponClient;
			import com.dsh.course.feignClient.activity.PointMercharsClient;
			import com.dsh.course.feignClient.activity.model.*;
			import com.dsh.course.feignClient.course.CourseClient;
			import com.dsh.guns.config.UserExt;
			import com.dsh.guns.core.base.controller.BaseController;
			import com.dsh.guns.core.base.tips.ErrorTip;
			import com.dsh.guns.core.base.tips.SuccessTip;
			import com.dsh.guns.core.common.constant.factory.PageFactory;
			import com.dsh.guns.core.util.ToolUtil;
			import com.dsh.guns.modular.system.model.CouponDataVo;
			import com.dsh.guns.modular.system.model.Region;
			import com.dsh.guns.modular.system.model.TCity;
			import com.dsh.guns.modular.system.model.TStore;
			import com.dsh.guns.modular.system.model.*;
			import com.dsh.guns.modular.system.service.ICityService;
			import com.dsh.guns.modular.system.service.IRegionService;
			import com.dsh.guns.modular.system.service.IStoreService;
			@@ -35,6 +33,8 @@

			import javax.annotation.Resource;
			import java.io.IOException;
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.util.*;
			import java.util.stream.Collectors;
			@@ -70,6 +70,9 @@
			@Autowired
			private ICityService cityService;

			@Autowired
			private CourseClient courseClient;

			@Resource
			private PointMercharsClient pointMercharsClient;

			@@ -94,7 +97,72 @@
			model.addAttribute("userType",objectType);
			List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
			model.addAttribute("list",list);
			List<Map<String,Object>> listOne = courseClient.getPageageType();
			model.addAttribute("courseType",listOne);


			return PREFIX + "TGoods_add.html";
			}

			/**
			* 跳转到添加
			*/
			@RequestMapping("/tGoods_info")
			public String tGoodsInfo(Model model) {
			Integer objectType = UserExt.getUser().getObjectType();
			System.out.println(objectType);
			model.addAttribute("userType",objectType);
			List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
			model.addAttribute("list",list);
			return PREFIX + "TGoods_detail_one.html";
			}

			@RequestMapping("/goods_info/{id}")
			public String memberCouponInfo(@PathVariable Integer id, Model model) {
			PointsMerchandise pointMercharsVo = pointMercharsClient.queryPointMerchaseById(id);
			model.addAttribute("item",pointMercharsVo);
			if(pointMercharsVo.getType()==2){
			Date startTime = pointMercharsVo.getStartTime();
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			model.addAttribute("sTime",format.format(startTime));
			model.addAttribute("eTime",format.format(pointMercharsVo.getEndTime()));
			Integer shopId = pointMercharsClient.getshopName(id);
			TStore byId = storeService.getById(shopId);
			model.addAttribute("shopName",byId.getName());
			Integer coursePackageId = pointMercharsVo.getCoursePackageId();
			List<String> name = courseClient.queryPackageById(coursePackageId);
			Integer coursePackageId1 = pointMercharsVo.getCoursePackageId();
			String classHours = courseClient.getHours(coursePackageId1);
			model.addAttribute("typeName",name.get(0));
			model.addAttribute("pageName",name.get(1));
			model.addAttribute("classHours",classHours);
			String productImages = pointMercharsVo.getProductImages();
			ArrayList<String> strings = new ArrayList<>();
			for (String s : productImages.split(",")) {
			strings.add(s);
			}
			model.addAttribute("pictures",strings);
			return PREFIX + "TGoods_detail_two.html";
			}else {
			GoodsInfoOneVo infoOneVo = pointMercharsClient.queryDetailsOfGoods(id);
			System.out.println("pointMercharsVo:"+infoOneVo);
			model.addAttribute("item",infoOneVo);
			String[] split = infoOneVo.getPics().split(",");
			List<String> list = Arrays.asList(split);
			if (infoOneVo.getUseScope() == 2){
			List<StoreVos> provinces = pointMercharsClient.getProvinces(id);
			model.addAttribute("city",provinces);
			}
			if (infoOneVo.getUseScope() == 2){
			List<StoreVos> storeVos = pointMercharsClient.getStoreList(id);
			model.addAttribute("store",storeVos);
			}
			model.addAttribute("pictures",list);
			model.addAttribute("exchangeMethod",infoOneVo.getExchangeMethod());
			return PREFIX + "TGoods_detail_one.html";
			}


			}


			@@ -328,6 +396,105 @@
			pointMercharsClient.updateGoodsDetail(stringObjectHashMap);
			return new SuccessTip<>();
			}
			/*
			ajax.set("typeAll",typeAll);
			ajax.set("provinceCode",pCode);
			ajax.set("cityCode",cCode);
			ajax.set("storeId",storeId);
			ajax.set("coursePackageTypeId",coursePackageTypeId);
			ajax.set("coursePackageId",coursePackageId);
			ajax.set("coursePackageConfigId",coursePackageConfigId);
			ajax.set("price",price);
			ajax.set("type",type);
			ajax.set("integral",integral);
			ajax.set("cash",cash);
			ajax.set("cover",cover1);
			ajax.set("imgOne",imgOne);
			ajax.set("userPopulation",userPopulation);
			ajax.set("quantityIssued",quantityIssued);
			ajax.set("pickUpQuantity",pickUpQuantity);
			ajax.set("startTime",startTime);
			ajax.set("text",text);
			ajax.set("sort",sort);
			ajax.set("useScope",company);
			ajax.set("cityIds",cts);
			ajax.set("storeIds",stores);
			*/
			@PostMapping(value = "/add")
			@ResponseBody
			public Object add( Integer typeAll,String provinceCode,String cityCode,Integer storeId,Integer coursePackageTypeId,Integer coursePackageId,Integer coursePackageConfigId,
			Double price,Integer type,Integer integral,Double cash,String cover,String imgOne,Integer userPopulation,Integer quantityIssued,Integer pickUpQuantity,
			String startTime,String text,Integer sort,String name,Integer useScope,String cityIds,String storeIds,Integer cardType
			) throws ParseException {
			PointsMerchandise pointsMerchandise = new PointsMerchandise();
			pointsMerchandise.setType(typeAll);
			pointsMerchandise.setName(name);
			pointsMerchandise.setCoursePackageId(coursePackageId);
			pointsMerchandise.setPrice(new BigDecimal(price));
			pointsMerchandise.setRedemptionMethod(type);
			if(type==2 \|\| type==3){
			pointsMerchandise.setCash(new BigDecimal(cash));
			}
			if(type==1 \|\| type==2){
			pointsMerchandise.setIntegral(integral);
			}
			pointsMerchandise.setCover(cover);
			pointsMerchandise.setProductImages(imgOne);
			pointsMerchandise.setUserPopulation(userPopulation);
			pointsMerchandise.setCardType(cardType);
			pointsMerchandise.setQuantityIssued(quantityIssued);
			pointsMerchandise.setPickUpQuantity(pickUpQuantity);
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			pointsMerchandise.setStartTime(format.parse(startTime.split(" - ")[0]));
			pointsMerchandise.setEndTime(format.parse(startTime.split(" - ")[1]));
			pointsMerchandise.setUseScope(useScope);
			if(ToolUtil.isNotEmpty(provinceCode)){
			TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, provinceCode));
			pointsMerchandise.setProvinceCode(provinceCode);
			pointsMerchandise.setProvince(one.getName());
			}
			if(ToolUtil.isNotEmpty(cityCode)){
			TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cityCode));
			pointsMerchandise.setCityCode(cityCode);
			pointsMerchandise.setCity(one.getName());
			}
			pointsMerchandise.setRedemptionInstructions(text);
			pointsMerchandise.setSort(sort);
			pointsMerchandise.setState(1);
			pointsMerchandise.setInsertTime(new Date());
			pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId);
			// 代替storeId
			pointsMerchandise.setShelves(storeId);
			Integer id = pointMercharsClient.add(pointsMerchandise);
			if(typeAll!=2){
			if(useScope==2){
			ArrayList<Map<String,String>> objects = new ArrayList<>();
			for (String s : cityIds.split(",")) {
			TCity tCity = cityService.getById(Integer.valueOf(s));
			HashMap<String, String> map = new HashMap<>();
			TCity pCity = cityService.getById(tCity.getParentId());
			map.put("pName",pCity.getName());
			map.put("pCode",pCity.getCode());
			map.put("cName",tCity.getName());
			map.put("cCode",tCity.getCode());
			map.put("id",id.toString());
			objects.add(map);
			}
			pointMercharsClient.addCitys(objects);
			}else if(useScope==3){
			String pam = id+"_"+storeIds;
			// 添加多个城市门店
			try{
			pointMercharsClient.addOther(pam);

			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}
			return new SuccessTip<>();

			}


			/**
			@@ -468,4 +635,7 @@
			}





			}