java/PlayPai.git

			@@ -868,7 +868,7 @@
			if (ToolUtil.isEmpty(tAppUser)){
			return ResultUtil.error("用户不存在");
			}
			// 查询是否超出限领数量
			// todo 积分商品明细查询是否超出限领数量
			switch (exchangeType.getGoodsType()){
			case 1:

			@@ -1334,6 +1334,7 @@
			List<StoreResponse> responses = new ArrayList<>();
			if (goodsType == 4){
			List<Integer> couponStoreIds = ucponClient.getCouponStoreIds(pointsMerId);
			if (couponStoreIds.size() > 0 ){
			for (Integer couponStoreId : couponStoreIds) {
			StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStoreId);
			if(ToolUtil.isNotEmpty(courseOfStore)){
			@@ -1343,8 +1344,11 @@
			responses.add(response);
			}
			}
			}

			}else {
			List<Integer> integers = mcsClient.queryPointMerStoreIds(pointsMerId);
			if (integers.size() > 0 ){
			for (Integer integer : integers) {
			StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(integer);
			if(ToolUtil.isNotEmpty(courseOfStore)){
			@@ -1355,6 +1359,7 @@
			}
			}
			}
			}
			return responses;
			}

			@@ -235,10 +235,13 @@
			}
			detailsVo.setCost(merchandise.getPrice());
			if (merchandise.getUseScope() == 1){
			detailsVo.setExchangeAddrType(1);
			detailsVo.setBelongs("全国通用");
			}else if (merchandise.getUseScope() == 2){
			detailsVo.setExchangeAddrType(2);
			detailsVo.setBelongs(merchandise.getProvince()+"\|"+merchandise.getCity() + "用户可用");
			}else {
			detailsVo.setExchangeAddrType(3);
			List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
			.eq("pointsMerchandiseId",merchandise.getId() ));
			PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
			@@ -286,14 +289,17 @@
			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());

	cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史