java/zhihuishenqu.git

			@@ -35,6 +35,7 @@
			import com.panzhihua.service_community.service.ComActWarehouseDonatesService;

			import lombok.extern.slf4j.Slf4j;
			import org.springframework.transaction.annotation.Transactional;

			/**
			* 爱心义仓/物品捐赠表(ComActWarehouseDonates)表服务实现类
			@@ -60,6 +61,7 @@
			* @return
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R batchImportWarehouseDonates(List<WarehouseDonatesExcelVO> list) {
			try {
			if (!list.isEmpty()) {
			@@ -79,6 +81,7 @@
			comActWarehouseOperation.setUserId(donate.getSigningBy().intValue());
			comActWarehouseOperation.setContent("工作人员完成了物品签收");
			comActWarehouseOperation.setCreateTime(nowDate);
			comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
			operationList.add(comActWarehouseOperation);
			}
			});
			@@ -143,6 +146,7 @@
			* @return
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R addDonates(ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
			ComActWarehouseDonates comActWarehouseDonates = new ComActWarehouseDonates();
			BeanUtils.copyProperties(comActWarehouseDonatesDTO, comActWarehouseDonates);
			@@ -164,6 +168,7 @@
			comActWarehouseOperation.setUserId(comActWarehouseDonates.getSigningBy().intValue());
			comActWarehouseOperation.setContent("工作人员完成了物品签收");
			comActWarehouseOperation.setCreateTime(nowDate);
			comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
			comActWarehouseOperationDao.insert(comActWarehouseOperation);
			}
			return R.ok();
			@@ -184,7 +189,7 @@
			if (isNull(comActWarehouseDonatesVO)) {
			return R.fail("捐赠物品记录不存在");
			}
			if (nonNull(isWhich)) {
			if (nonNull(isWhich) && isWhich.intValue() != 0) {
			if (isWhich.intValue() == 3) {
			String name = comActWarehouseDonatesVO.getName();
			if (comActWarehouseDonatesVO.getIsAnonymous().equals(ComActWarehouseDonatesVO.isAnonymous.yes) \|\| isBlank(name)) {
			@@ -197,17 +202,8 @@
			if (isWhich.intValue() == 1 && !userId.equals(comActWarehouseDonatesVO.getUserId())) {
			return R.fail("无法获取他人捐赠记录");
			}
			List<ComActWarehouseOperation> operationDOList = comActWarehouseOperationDao.selectList(new QueryWrapper<ComActWarehouseOperation>()
			.lambda().eq(ComActWarehouseOperation::getGoodsId, donatesId));
			List<ComActWarehouseOperationVO> operationVOList = new ArrayList<>();
			if (!operationDOList.isEmpty()) {
			operationDOList.forEach(operation -> {
			ComActWarehouseOperationVO operationVO = new ComActWarehouseOperationVO();
			BeanUtils.copyProperties(operation, operationVO);
			operationVOList.add(operationVO);
			});
			}
			comActWarehouseDonatesVO.setOperationList(operationVOList);
			List<ComActWarehouseOperationVO> operationList = comActWarehouseOperationDao.selectList(donatesId);
			comActWarehouseDonatesVO.setOperationList(operationList);
			}
			return R.ok(comActWarehouseDonatesVO);
			}
			@@ -218,6 +214,7 @@
			* @return
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R signingDonates(ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
			ComActWarehouseDonates comActWarehouseDonates = this.baseMapper.selectById(comActWarehouseDonatesDTO.getId());
			if (isNull(comActWarehouseDonates)) {
			@@ -238,6 +235,7 @@
			comActWarehouseOperation.setContent("工作人员完成了物品签收");
			comActWarehouseOperation.setCreateTime(nowDate);
			comActWarehouseOperationDao.insert(comActWarehouseOperation);
			comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
			return R.ok();
			}
			return R.fail("签收失败");
			@@ -269,6 +267,7 @@
			comActWarehouseOperation.setUserId(currentUser.intValue());
			comActWarehouseOperation.setContent("已取消捐赠");
			comActWarehouseOperation.setCreateTime(new Date());
			comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
			comActWarehouseOperationDao.insert(comActWarehouseOperation);
			}
			return R.ok();