java/HongRuiTang.git

			@@ -249,11 +249,9 @@
			//获取会员商品总数
			List<ServiceRecordDetail> serviceRecordDetailList = new ArrayList<>();
			ServiceRecordDetail serviceRecordDetail;
			//MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getMemberUserId(), merSureConsumerGoodsDto.getShopId());
			List<String> consumerGoodsList = new ArrayList<>();
			List<Map<String, Object>> sendData = new ArrayList<>();
			for (MerSureConsumerGoodsListDto goodsDto : goodsList) {
			Map<String, Object> map = new HashMap<>();
			consumerGoods = this.getById(goodsDto.getConsumerGoodsId());
			serviceRecordDetail = new ServiceRecordDetail();
			serviceNum = consumerGoods.getServiceNum();
			@@ -275,6 +273,7 @@

			int number = consumerGoods.getServiceNum() - consumerGoods.getUsedNum();
			if(number < 3){
			Map<String, Object> map = new HashMap<>();
			map.put("product", consumerGoods.getGoodsName());
			map.put("number", number);
			sendData.add(map);
			@@ -319,17 +318,6 @@
			}
			serviceRecordDetailList.add(serviceRecordDetail);
			}

			//判断是否减人
			/*if (cycleService > 0 && memberGoodsTotal.getCycleOrder() - cycleService < 1) {
			cyclePerson = 1;
			}
			if (serviceService > 0 && memberGoodsTotal.getServiceOrder() - serviceService < 1) {
			servicePerson = 1;
			}
			if (experienceService > 0 && memberGoodsTotal.getExperienceOrder() - experienceService < 1) {
			experiencePerson = 1;
			}*/
			serviceCount = cycleService + serviceService + experienceService;
			UserServiceRecord serviceRecord = new UserServiceRecord();
			serviceRecord.setCreateTime(new Date());
			@@ -351,18 +339,6 @@
			memberTotalChange.setTypeService(2);
			memberTotalChange.setServiceCount(serviceCount);
			remoteMemberService.changeMemberTotal(memberTotalChange);
			/*ShopTotalChangeDto shopTotalChange = new ShopTotalChangeDto();
			shopTotalChange.setShopId(merSureConsumerGoodsDto.getShopId());
			shopTotalChange.setTypeCycleService(2);
			shopTotalChange.setCycleService(cycleService);
			shopTotalChange.setCyclePerson(cyclePerson);
			shopTotalChange.setTypeServiceService(2);
			shopTotalChange.setServiceService(serviceService);
			shopTotalChange.setServicePerson(servicePerson);
			shopTotalChange.setTypeExperienceService(2);
			shopTotalChange.setExperienceService(experienceService);
			shopTotalChange.setExperiencePerson(experiencePerson);
			remoteShopService.changeShopTotal(shopTotalChange);*/
			if(!sendData.isEmpty()){
			Member member = remoteMemberService.getMember(userId).getData();
			R<Shop> r = remoteShopService.getShop(shopId);