java/HongRuiTang.git

			@@ -18,6 +18,7 @@
			import com.ruoyi.order.service.order.ConsumerGoodsService;
			import com.ruoyi.order.service.order.ServiceRecordDetailService;
			import com.ruoyi.order.service.order.UserServiceRecordService;
			import com.ruoyi.order.util.MsgUtils;
			import com.ruoyi.system.api.constant.AppErrorConstant;
			import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
			import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
			@@ -26,6 +27,7 @@
			import com.ruoyi.system.api.domain.poji.goods.Goods;
			import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
			import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
			import com.ruoyi.system.api.domain.poji.member.Member;
			import com.ruoyi.system.api.service.RemoteGoodsService;
			import com.ruoyi.system.api.service.RemoteMemberService;
			import com.ruoyi.system.api.service.RemoteShopService;
			@@ -142,6 +144,7 @@
			consumerGoods.setUsedNum(0);
			consumerGoods.setCreateTime(new Date());
			consumerGoods.setGoodsType(goods.getGoodsType());
			consumerGoods.setGoodsTag(goods.getGoodsTags());
			consumerGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
			consumerGoods.setGoodsPicture(goodsFile.getFileUrl());
			consumerGoods.setGoodsNurses(goods.getGoodsNurses());
			@@ -239,6 +242,7 @@
			List<ServiceRecordDetail> serviceRecordDetailList = new ArrayList<>();
			ServiceRecordDetail serviceRecordDetail;
			MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getMemberUserId(), merSureConsumerGoodsDto.getShopId());
			List<String> consumerGoodsList = new ArrayList<>();
			for (MerSureConsumerGoodsListDto goodsDto : goodsList) {
			consumerGoods = this.getById(goodsDto.getConsumerGoodsId());
			serviceRecordDetail = new ServiceRecordDetail();
			@@ -292,8 +296,12 @@
			serviceRecordDetail.setConsumerGoodsName(consumerGoods.getGoodsName());
			serviceRecordDetail.setServiceNum(consumerGoods.getServiceNum());
			serviceRecordDetail.setSurpNum(consumerGoods.getServiceNum()-consumerGoods.getUsedNum());
			if(serviceRecordDetail.getSurpNum()==0){
			consumerGoodsList.add(consumerGoods.getGoodsName());
			}
			serviceRecordDetailList.add(serviceRecordDetail);
			}

			//判断是否减人
			if (cycleService > 0 && memberGoodsTotal.getCycleOrder() - cycleService < 1) {
			cyclePerson = 1;
			@@ -336,6 +344,14 @@
			shopTotalChange.setExperienceService(experienceService);
			shopTotalChange.setExperiencePerson(experiencePerson);
			remoteShopService.changeShopTotal(shopTotalChange);
			if(!consumerGoodsList.isEmpty()){
			Member member = remoteMemberService.getMember(userId).getData();
			try {
			MsgUtils.sendMsg(member.getMobile(),null,null);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			}
			}
			}

			@@ -420,6 +436,7 @@
			consumerGoods.setUsedNum(0);
			consumerGoods.setCreateTime(new Date());
			consumerGoods.setGoodsType(goods.getGoodsType());
			consumerGoods.setGoodsTag(goods.getGoodsTags());
			consumerGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
			consumerGoods.setGoodsPicture(goodsFile.getFileUrl());
			consumerGoods.setGoodsNurses(goods.getGoodsNurses());