From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 305 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 265 insertions(+), 40 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
index 84e8d05..c6c6203 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
+import com.ruoyi.order.domain.pojo.order.ServiceRecordDetail;
import com.ruoyi.order.domain.pojo.order.UserServiceRecord;
import com.ruoyi.order.domain.vo.AppConsumerPageVo;
import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
@@ -14,17 +16,26 @@
import com.ruoyi.order.domain.vo.MerMemberConsumerGoodsTotalVo;
import com.ruoyi.order.mapper.order.ConsumerGoodsMapper;
import com.ruoyi.order.service.order.ConsumerGoodsService;
+import com.ruoyi.order.service.order.ServiceRecordDetailService;
import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
+import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import com.ruoyi.system.api.domain.dto.MemberTotalChangeDto;
import com.ruoyi.system.api.domain.dto.ShopTotalChangeDto;
+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.service.RemoteGoodsService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* <p>
@@ -48,6 +59,12 @@
@Resource
private RemoteShopService remoteShopService;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
+
+ @Resource
+ private ServiceRecordDetailService serviceRecordDetailService;
/**
* 获取用户服务
@@ -82,7 +99,12 @@
* @param merSureConsumerGoodsDto
*/
@Override
+ @Transactional
public void sureMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){
+ ConsumerGoods oldConsumerGoods = this.getById(merSureConsumerGoodsDto.getConsumerGoodsId());
+ if(oldConsumerGoods.getSureNum()==null||oldConsumerGoods.getSureNum()<1){
+ throw new ServiceException(AppErrorConstant.GOODS_SURE_FAILED);
+ }
List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList();
if(merSureConsumerGoodsListDtoList!=null && !merSureConsumerGoodsListDtoList.isEmpty()){
ConsumerGoods consumerGoods;
@@ -93,27 +115,69 @@
Integer servicePerson = 0;
Integer experienceService = 0;
Integer experiencePerson = 0;
+ Goods goods;
+ GoodsFile goodsFile;
+ String consumerGoodsId;
+ List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
MerMemberConsumerGoodsTotalVo memberConsumerGoodsTotalVo = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getUserId(), merSureConsumerGoodsDto.getShopId());
+ int sureNum = 0;
for(MerSureConsumerGoodsListDto merSureConsumerGoodsListDto : merSureConsumerGoodsListDtoList){
- consumerGoods = this.getById(merSureConsumerGoodsListDto.getConsumerGoodsId());
- consumerGoods.setCycleNumFlag(1);
- consumerGoods.setServiceNum(merSureConsumerGoodsListDto.getServiceNum());
- this.saveOrUpdate(consumerGoods);
- //处理商品服务次数
- switch (consumerGoods.getGoodsType()) {
- case 1:
- cycleService = cycleService + consumerGoods.getServiceNum();
- break;
- case 2:
- serviceService = serviceService + consumerGoods.getServiceNum();
- break;
- case 3:
- experienceService = experienceService + consumerGoods.getServiceNum();
- break;
- default:
- break;
+ goods = remoteGoodsService.getGoods(merSureConsumerGoodsListDto.getGoodsId()).getData();
+ goodsFile = remoteGoodsService.getGoodsFile(goods.getGoodsId()).getData();
+ if(goods!=null&&goods.getGoodsType()==1&&goods.getCycleNumFlag()==1){
+ for(int i=0;i<merSureConsumerGoodsListDto.getGoodsNum();i++){
+ consumerGoods = new ConsumerGoods();
+ consumerGoodsId = IdUtils.simpleUUID();
+ consumerGoods.setConsumerGoodsId(consumerGoodsId);
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(merSureConsumerGoodsDto.getShopId());
+ consumerGoods.setUserId(merSureConsumerGoodsDto.getMemberUserId());
+ consumerGoods.setOrderId(oldConsumerGoods.getOrderId());
+ consumerGoods.setOrderGoodsId(oldConsumerGoods.getOrderGoodsId());
+ consumerGoods.setGoodsId(goods.getGoodsId());
+ consumerGoods.setGoodsName(goods.getGoodsName());
+ consumerGoods.setCycleNumFlag(goods.getCycleNumFlag());
+ consumerGoods.setServiceNum(goods.getServiceNum());
+ 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());
+ consumerGoods.setSourceFrom(1);
+ consumerGoodsList.add(consumerGoods);
+ //处理商品服务次数
+ switch (consumerGoods.getGoodsType()) {
+ case 1:
+ cycleService = cycleService + consumerGoods.getServiceNum();
+ break;
+ case 2:
+ serviceService = serviceService + consumerGoods.getServiceNum();
+ break;
+ case 3:
+ experienceService = experienceService + consumerGoods.getServiceNum();
+ break;
+ default:
+ break;
+ }
+ sureNum = sureNum + 1;
+ }
}
}
+ if(sureNum>oldConsumerGoods.getSureNum()){
+ throw new ServiceException(AppErrorConstant.GOODS_SURE_FAILED);
+ }else{
+ int surpNum = oldConsumerGoods.getSureNum();
+ surpNum = surpNum - sureNum;
+ oldConsumerGoods.setSureNum(surpNum);
+ if(surpNum==0){
+ oldConsumerGoods.setDelFlag(1);
+ }
+ this.saveOrUpdate(oldConsumerGoods);
+ }
+ this.saveBatch(consumerGoodsList);
//判断是否加人
if (cycleService > 0 && memberConsumerGoodsTotalVo.getCycleOrder() == 0) {
cyclePerson = 1;
@@ -147,14 +211,15 @@
}
/**
- * 确认商品次数
+ * 消费服务商品
* @param merSureConsumerGoodsDto
*/
@Override
+ @Transactional
public void useMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){
List<MerSureConsumerGoodsListDto> goodsList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList();
if (goodsList != null && !goodsList.isEmpty()) {
- ConsumerGoods goods;
+ ConsumerGoods consumerGoods;
Integer serviceNum;
Integer usedNum;
Integer useNum;
@@ -172,42 +237,45 @@
Integer experienceService = 0;
Integer experiencePerson = 0;
//获取会员商品总数
- MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getUserId(), merSureConsumerGoodsDto.getShopId());
+ List<ServiceRecordDetail> serviceRecordDetailList = new ArrayList<>();
+ ServiceRecordDetail serviceRecordDetail;
+ MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getMemberUserId(), merSureConsumerGoodsDto.getShopId());
for (MerSureConsumerGoodsListDto goodsDto : goodsList) {
- goods = this.getById(goodsDto.getConsumerGoodsId());
- serviceNum = goods.getServiceNum();
- usedNum = goods.getUsedNum();
+ consumerGoods = this.getById(goodsDto.getConsumerGoodsId());
+ serviceRecordDetail = new ServiceRecordDetail();
+ serviceNum = consumerGoods.getServiceNum();
+ usedNum = consumerGoods.getUsedNum();
surplusNum = serviceNum - usedNum;
useNum = goodsDto.getServiceNum();
//判断使用数量是否超过剩余数量
if (useNum > surplusNum) {
throw new ServiceException(AppErrorConstant.BEYOND_SURP_NUM);
}
- goods.setUsedNum(usedNum + useNum);
- goods.setUseTime(new Date());
+ consumerGoods.setUsedNum(usedNum + useNum);
+ consumerGoods.setUseTime(new Date());
//判断商品是否已使用完
- if (goods.getUsedNum().equals(serviceNum)) {
- goods.setServiceStatus(2);
- goods.setCompleteTime(new Date());
+ if (consumerGoods.getUsedNum().equals(serviceNum)) {
+ consumerGoods.setServiceStatus(2);
+ consumerGoods.setCompleteTime(new Date());
}
- this.saveOrUpdate(goods);
- shopId = goods.getShopId();
- userId = goods.getUserId();
- serviceType = goods.getGoodsType();
+ this.saveOrUpdate(consumerGoods);
+ shopId = consumerGoods.getShopId();
+ userId = consumerGoods.getUserId();
+ serviceType = consumerGoods.getGoodsType();
//拼接商品ID
if (StringUtils.isBlank(goodsIds)) {
- goodsIds = goods.getConsumerGoodsId();
+ goodsIds = consumerGoods.getConsumerGoodsId();
} else {
- goodsIds = goodsIds + "," + goods.getConsumerGoodsId();
+ goodsIds = goodsIds + "," + consumerGoods.getConsumerGoodsId();
}
//拼接商品名称
if (StringUtils.isBlank(goodsNames)) {
- goodsNames = goods.getGoodsName();
+ goodsNames = consumerGoods.getGoodsName();
} else {
- goodsNames = goodsNames + "、" + goods.getGoodsName();
+ goodsNames = goodsNames + "、" + consumerGoods.getGoodsName();
}
//处理商品服务次数
- switch (goods.getGoodsType()) {
+ switch (consumerGoods.getGoodsType()) {
case 1:
cycleService = cycleService + useNum;
break;
@@ -220,6 +288,12 @@
default:
break;
}
+ serviceRecordDetail.setDelFlag(0);
+ serviceRecordDetail.setConsumerGoodsId(consumerGoods.getConsumerGoodsId());
+ serviceRecordDetail.setConsumerGoodsName(consumerGoods.getGoodsName());
+ serviceRecordDetail.setServiceNum(consumerGoods.getServiceNum());
+ serviceRecordDetail.setSurpNum(consumerGoods.getServiceNum()-consumerGoods.getUsedNum());
+ serviceRecordDetailList.add(serviceRecordDetail);
}
//判断是否减人
if (cycleService > 0 && memberGoodsTotal.getCycleOrder() - cycleService < 1) {
@@ -241,9 +315,13 @@
serviceRecord.setConsumerGoodsIds(goodsIds);
serviceRecord.setConsumerGoodsNames(goodsNames);
userServiceRecordService.saveOrUpdate(serviceRecord);
+ for(ServiceRecordDetail serviceRecordDetail1 : serviceRecordDetailList){
+ serviceRecordDetail1.setRecordId(serviceRecord.getId());
+ }
+ serviceRecordDetailService.saveBatch(serviceRecordDetailList);
//更新商户和会员服务统计
MemberTotalChangeDto memberTotalChange = new MemberTotalChangeDto();
- memberTotalChange.setUserId(merSureConsumerGoodsDto.getUserId());
+ memberTotalChange.setUserId(merSureConsumerGoodsDto.getMemberUserId());
memberTotalChange.setTypeService(2);
memberTotalChange.setServiceCount(serviceCount);
remoteMemberService.changeMemberTotal(memberTotalChange);
@@ -286,4 +364,151 @@
public MerMemberConsumerGoodsTotalVo getMemberConsumerGoodsTotalVo(Long userId, Long shopId){
return consumerGoodsMapper.getMemberConsumerGoodsTotalVo(userId, shopId);
}
+
+ /**
+ * @description 发放用户商品礼物
+ * @author jqs
+ * @date 2023/7/7 18:51
+ * @param giftSendDtoList
+ * @return void
+ */
+ @Override
+ public void sendGoodsGift(List<BirthdayGiftSendDto> giftSendDtoList){
+ // 使用StringJoiner拼接goodsId
+ StringJoiner goodsSj = new StringJoiner(",");
+ for (BirthdayGiftSendDto birthdayGiftSendDto : giftSendDtoList) {
+ goodsSj.add(birthdayGiftSendDto.getGoodsId());
+ }
+ String goodsIds = goodsSj.toString();
+ // 获取商品列表
+ List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(goodsIds).getData();
+ // 初始化变量
+ List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
+ Map<String, Goods> goodsMap = goodsList.stream()
+ .collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
+ ConsumerGoods consumerGoods;
+ String consumerGoodsId;
+ Goods goods;
+ String goodsId;
+ GoodsFile goodsFile;
+ AppShopGoodsGetDto appShopGoodsGetDto;
+ ShopGoods shopGoods = null;
+ // 遍历giftSendDtoList
+ for (BirthdayGiftSendDto birthdayGiftSendDto : giftSendDtoList) {
+ goodsId = birthdayGiftSendDto.getGoodsId();
+ goods = goodsMap.get(goodsId);
+ goodsFile = remoteGoodsService.getGoodsFile(goods.getGoodsId()).getData();
+ // 获取商户服务次数
+ if (birthdayGiftSendDto.getGiftFrom() == 2) {
+ appShopGoodsGetDto = new AppShopGoodsGetDto();
+ appShopGoodsGetDto.setGoodsId(goodsId);
+ appShopGoodsGetDto.setShopId(birthdayGiftSendDto.getShopId());
+ shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
+ }
+ // 根据goodsNumber创建ConsumerGoods对象并添加到列表中
+ for (int i = 0; i < birthdayGiftSendDto.getGoodsNumber(); i++) {
+ consumerGoods = new ConsumerGoods();
+ consumerGoodsId = IdUtils.simpleUUID();
+ consumerGoods.setConsumerGoodsId(consumerGoodsId);
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(birthdayGiftSendDto.getShopId());
+ consumerGoods.setUserId(birthdayGiftSendDto.getUserId());
+ consumerGoods.setGoodsId(goodsId);
+ consumerGoods.setGoodsName(goods.getGoodsName());
+ consumerGoods.setCycleNumFlag(goods.getCycleNumFlag());
+ consumerGoods.setServiceNum(goods.getServiceNum());
+ 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());
+ consumerGoods.setSourceFrom(3);
+ // 如果shopGoods不为空，则使用shopGoods的serviceNum
+ if (shopGoods != null) {
+ consumerGoods.setServiceNum(shopGoods.getServiceNum());
+ }
+ consumerGoodsList.add(consumerGoods);
+ }
+ }
+ // 批量保存consumerGoodsList
+ this.saveBatchConsumerGoods(consumerGoodsList);
+ }
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/7 19:31
+ * @param consumerGoodsList
+ * @return boolean
+ */
+ @Override
+ public boolean saveBatchConsumerGoods(List<ConsumerGoods> consumerGoodsList){
+ Integer serviceCount = 0;
+ Integer cycleService = 0;
+ Integer cyclePerson = 0;
+ Integer serviceService = 0;
+ Integer servicePerson = 0;
+ Integer experienceService = 0;
+ Integer experiencePerson = 0;
+ Long shopId = consumerGoodsList.get(0).getShopId();
+ Long userId = consumerGoodsList.get(0).getUserId();
+ MerMemberConsumerGoodsTotalVo memberConsumerGoodsTotalVo = this.getMemberConsumerGoodsTotalVo(userId, shopId);
+ for(ConsumerGoods consumerGoods : consumerGoodsList){
+ //处理商品服务次数
+ switch (consumerGoods.getGoodsType()) {
+ case 1:
+ if(consumerGoods.getServiceNum()!=null){
+ cycleService = cycleService + consumerGoods.getServiceNum();
+ }
+ break;
+ case 2:
+ if(consumerGoods.getServiceNum()!=null){
+ serviceService = serviceService + consumerGoods.getServiceNum();
+ }
+ break;
+ case 3:
+ if(consumerGoods.getServiceNum()!=null) {
+ experienceService = experienceService + consumerGoods.getServiceNum();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ //判断是否加人
+ if (cycleService > 0 && memberConsumerGoodsTotalVo.getCycleOrder() == 0) {
+ cyclePerson = 1;
+ }
+ if (serviceService > 0 && memberConsumerGoodsTotalVo.getServiceOrder() == 0) {
+ servicePerson = 1;
+ }
+ if (experienceService > 0 && memberConsumerGoodsTotalVo.getExperienceOrder() == 0) {
+ experiencePerson = 1;
+ }
+ serviceCount = cycleService + serviceService + experienceService;
+ //更新商户和会员服务统计
+ MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
+ memberTotalChangeDto.setUserId(userId);
+ memberTotalChangeDto.setTypeService(1);
+ memberTotalChangeDto.setServiceCount(serviceCount);
+ remoteMemberService.changeMemberTotal(memberTotalChangeDto);
+ ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ shopTotalChangeDto.setShopId(shopId);
+ shopTotalChangeDto.setOrderType(1);
+ shopTotalChangeDto.setTypeCycleService(1);
+ shopTotalChangeDto.setCycleService(cycleService);
+ shopTotalChangeDto.setCyclePerson(cyclePerson);
+ shopTotalChangeDto.setTypeServiceService(1);
+ shopTotalChangeDto.setServiceService(serviceService);
+ shopTotalChangeDto.setServicePerson(servicePerson);
+ shopTotalChangeDto.setTypeExperienceService(1);
+ shopTotalChangeDto.setExperienceService(experienceService);
+ shopTotalChangeDto.setExperiencePerson(experiencePerson);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);
+ return this.saveBatch(consumerGoodsList);
+ }
}
--
Gitblit v1.7.1