优化查询为空问题

java110

2022-03-24 971023df5fd3795e24d10d4d4d03ee112df12297

 service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java

old mode 100644
new mode 100755
@@ -3,6 +3,7 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -43,15 +45,11 @@

    @Override
    public List<ResourceStoreDto> queryResourceStores(@RequestBody ResourceStoreDto resourceResourceStoreDto) {

        //校验是否传了 分页信息

        int page = resourceResourceStoreDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            resourceResourceStoreDto.setPage((page - 1) * resourceResourceStoreDto.getRow());
        }

        List<ResourceStoreDto> resourceResourceStores = BeanConvertUtil.covertBeanList(resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto)), ResourceStoreDto.class);
        //获取图片地址
        List<ResourceStoreDto> resourceStoreDtos = new ArrayList<>();
@@ -93,21 +91,50 @@
            info.put("resId", resourceStorePo.getResId());
            info.put("storeId", resourceStorePo.getStoreId());
            List<Map> stores = resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(info);

            Assert.listOnlyOne(stores, "不存在该物品");
            int stock = Integer.parseInt(stores.get(0).get("stock").toString());
            int newStock = Integer.parseInt(resourceStorePo.getStock());
            int totalStock = stock + newStock;

            if (totalStock < 0) {
            BigDecimal stock = new BigDecimal(stores.get(0).get("stock").toString());
            BigDecimal newStock = new BigDecimal(resourceStorePo.getStock().toString());
            BigDecimal totalStock = stock.add(newStock);
            BigDecimal zeroStock = new BigDecimal (0);
            if (totalStock.compareTo(zeroStock)== -1) {
                throw new IllegalArgumentException("库存不足，参数有误");
            }
            resourceStorePo.setStock(totalStock + "");
            //入库操作 对物品进行加权平均
            if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.RES_ORDER_TYPE_ENTER)
                    || (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE))) {
                //获取原均价
                Object averageOldPrice = stores.get(0).get("averagePrice");
                BigDecimal price = new BigDecimal(0);
                if (averageOldPrice != null) {
                    price = new BigDecimal(averageOldPrice.toString());
                }
                //获取现在采购的价格
                BigDecimal newPrice = new BigDecimal(resourceStorePo.getPurchasePrice());
                //获取均价
                BigDecimal averagePriceTotal = ((newPrice.multiply(newStock)).add(price.multiply(stock)));
                BigDecimal averagePrice=averagePriceTotal.divide(totalStock,2,BigDecimal.ROUND_HALF_UP);
                resourceStorePo.setAveragePrice(averagePrice.toString());
            }
            if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE)) {
                resourceStorePo.setStock(stock + "");
            } else {
                resourceStorePo.setStock(totalStock + "");
            }
            resourceStorePo.setStatusCd("0");
            return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
        } finally {
            DistributedLock.releaseDistributedLock(requestId, key);
        }
    }

    /**
     * 新增物品
     *
     * @param resourceStoreDto
     */
    @Override
    public void saveResourceStore(@RequestBody ResourceStoreDto resourceStoreDto) {
        resourceResourceStoreServiceDaoImpl.saveResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceStoreDto));
    }

    public IResourceStoreServiceDao getResourceStoreServiceDaoImpl() {
@@ -118,6 +145,17 @@
        this.resourceResourceStoreServiceDaoImpl = resourceResourceStoreServiceDaoImpl;
    }

    @Override
    public String queryResourceStoresTotalPrice(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
        //校验是否传了 分页信息
        int page = resourceResourceStoreDto.getPage();
        if (page != PageDto.DEFAULT_PAGE) {
            resourceResourceStoreDto.setPage((page - 1) * resourceResourceStoreDto.getRow());
        }
        return resourceResourceStoreServiceDaoImpl.queryResourceStoresTotalPrice(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto));

    }

    public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
        return userInnerServiceSMOImpl;
    }