爱心义仓修改

puhanshu

2021-10-13 f7c16d24f7cb0d2b9e03ec24bfdbb72a11def5f9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java

@@ -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()) {
@@ -143,6 +145,7 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addDonates(ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
        ComActWarehouseDonates comActWarehouseDonates = new ComActWarehouseDonates();
        BeanUtils.copyProperties(comActWarehouseDonatesDTO, comActWarehouseDonates);
@@ -184,7 +187,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 +200,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 +212,7 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R signingDonates(ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
        ComActWarehouseDonates comActWarehouseDonates = this.baseMapper.selectById(comActWarehouseDonatesDTO.getId());
        if (isNull(comActWarehouseDonates)) {