From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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 ef6f2e0..bf1103a 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
@@ -3,19 +3,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.dto.AppConsumerPageDto;
-import com.ruoyi.order.domain.dto.MerConsumerGoodsDto;
-import com.ruoyi.order.domain.dto.MerSureConsumerGoodsDto;
-import com.ruoyi.order.domain.dto.MerSureConsumerGoodsListDto;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.domain.vo.AppConsumerPageVo;
import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
import com.ruoyi.order.domain.vo.MerConsumerGoodsVo;
import com.ruoyi.order.mapper.order.ConsumerGoodsMapper;
import com.ruoyi.order.service.order.ConsumerGoodsService;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -72,9 +72,54 @@
for(MerSureConsumerGoodsListDto merSureConsumerGoodsListDto : merSureConsumerGoodsListDtoList){
consumerGoods = this.getById(merSureConsumerGoodsListDto.getConsumerGoodsId());
consumerGoods.setCycleNumFlag(1);
- consumerGoods.setServiceNum(merSureConsumerGoodsListDto.getService_num());
+ consumerGoods.setServiceNum(merSureConsumerGoodsListDto.getServiceNum());
this.saveOrUpdate(consumerGoods);
}
}
}
+
+ /**
+ * 确认商品次数
+ * @param merSureConsumerGoodsDto
+ */
+ @Override
+ public void useMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){
+ List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList();
+ if(merSureConsumerGoodsListDtoList!=null && !merSureConsumerGoodsListDtoList.isEmpty()){
+ ConsumerGoods consumerGoods;
+ Integer serviceNum;
+ Integer usedNum;
+ Integer useNum;
+ Integer surpNum;
+ for(MerSureConsumerGoodsListDto merSureConsumerGoodsListDto : merSureConsumerGoodsListDtoList){
+ consumerGoods = this.getById(merSureConsumerGoodsListDto.getConsumerGoodsId());
+ serviceNum = consumerGoods.getServiceNum();
+ usedNum = consumerGoods.getUsedNum();
+ surpNum = serviceNum - usedNum;
+ useNum = merSureConsumerGoodsListDto.getServiceNum();
+ if(useNum>surpNum){
+ throw new ServiceException(AppErrorConstant.BEYOND_SURP_NUM);
+ }
+ consumerGoods.setUsedNum(usedNum+useNum);
+ consumerGoods.setUseTime(new Date());
+ if(consumerGoods.getUsedNum()==serviceNum){
+ consumerGoods.setServiceStatus(2);
+ consumerGoods.setCompleteTime(new Date());
+ }
+ this.saveOrUpdate(consumerGoods);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param page
+ * @param merConsumerGoodsPageDto
+ * @return
+ */
+ @Override
+ public List<MerConsumerGoodsListVo> pageMerConsumerGoodsNum(Page page, MerConsumerGoodsPageDto merConsumerGoodsPageDto){
+ List<MerConsumerGoodsListVo> merConsumerGoodsListVos = consumerGoodsMapper.pageMerConsumerGoodsNum(page, merConsumerGoodsPageDto);
+ return merConsumerGoodsListVos;
+ }
}
--
Gitblit v1.7.1