优化代码

java110-bean/src/main/java/com/java110/po/userStorehouse/UserStorehousePo.java

@@ -1,53 +1,70 @@
 package com.java110.po.userStorehouse;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class UserStorehousePo implements Serializable {
 
     private String resName;
-private String storeId;
-private String stock;
-private String resId;
-private String userId;
-private String usId;
-public String getResName() {
+    private String storeId;
+    private String stock;
+    private String resId;
+    private String userId;
+    private String usId;
+    private String statusCd = "0";
+
+    public String getResName() {
         return resName;
     }
-public void setResName(String resName) {
+
+    public void setResName(String resName) {
         this.resName = resName;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getStock() {
+
+    public String getStock() {
         return stock;
     }
-public void setStock(String stock) {
+
+    public void setStock(String stock) {
         this.stock = stock;
     }
-public String getResId() {
+
+    public String getResId() {
         return resId;
     }
-public void setResId(String resId) {
+
+    public void setResId(String resId) {
         this.resId = resId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getUsId() {
+
+    public String getUsId() {
         return usId;
     }
-public void setUsId(String usId) {
+
+    public void setUsId(String usId) {
         this.usId = usId;
     }
 
+    public String getStatusCd() {
+        return statusCd;
+    }
 
-
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml

@@ -13,6 +13,14 @@
         )
     </insert>
 
+    <insert id="saveUserStorehouses" parameterType="Map">
+        insert into user_storehouse(
+        res_name,b_id,store_id,stock,res_id,user_id,us_id
+        ) values (
+        #{resName},'-1',#{storeId},#{stock},#{resId},#{userId},#{usId}
+        )
+    </insert>
+
 
     <!-- 查询个人物品信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessUserStorehouseInfo" parameterType="Map" resultType="Map">

java110-interface/src/main/java/com/java110/intf/store/IUserStorehouseInnerServiceSMO.java

@@ -2,6 +2,7 @@ package com.java110.intf.store;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.userStorehouse.UserStorehouseDto;
+import com.java110.po.userStorehouse.UserStorehousePo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,4 +39,22 @@ public interface IUserStorehouseInnerServiceSMO {
      */
     @RequestMapping(value = "/queryUserStorehousesCount", method = RequestMethod.POST)
     int queryUserStorehousesCount(@RequestBody UserStorehouseDto userUserStorehousehouseDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param userStorehousePo 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/saveUserStorehouses", method = RequestMethod.POST)
+    int saveUserStorehouses(@RequestBody UserStorehousePo userStorehousePo);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param userStorehousePo 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/updateUserStorehouses", method = RequestMethod.POST)
+    int updateUserStorehouses(@RequestBody UserStorehousePo userStorehousePo);
 }

service-store/src/main/java/com/java110/store/api/CollectionApi.java

@@ -128,6 +128,7 @@ public class CollectionApi {
 
         PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
         purchaseApplyPo.setApplyOrderId(reqJson.getString("applyOrderId"));
+
         purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
         return resourceOutBMOImpl.out(purchaseApplyPo);
     }

service-store/src/main/java/com/java110/store/bmo/collection/impl/ResourceOutBMOImpl.java

@@ -1,13 +1,21 @@
 package com.java110.store.bmo.collection.impl;
 
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.dto.userStorehouse.UserStorehouseDto;
 import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
 import com.java110.intf.store.IPurchaseApplyDetailInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
 import com.java110.intf.store.IResourceStoreInnerServiceSMO;
+import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
 import com.java110.po.purchase.PurchaseApplyDetailPo;
 import com.java110.po.purchase.PurchaseApplyPo;
 import com.java110.po.purchase.ResourceStorePo;
+import com.java110.po.userStorehouse.UserStorehousePo;
 import com.java110.store.bmo.collection.IResourceOutBMO;
+import com.java110.utils.util.Assert;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -29,11 +37,23 @@ public class ResourceOutBMOImpl implements IResourceOutBMO {
     @Autowired
     private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserStorehouseInnerServiceSMO userStorehouseInnerServiceSMOImpl;
+
+    @Autowired
+    private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+
 
     @Override
     @Java110Transactional
     public ResponseEntity<String> out(PurchaseApplyPo purchaseApplyPo) {
 
+        PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
+        purchaseApplyDto.setApplyOrderId(purchaseApplyDto.getApplyOrderId());
+        List<PurchaseApplyDto> purchaseApplyDtos = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto);
+
+        Assert.listOnlyOne(purchaseApplyDtos, "出库单不存在");
+
         List<PurchaseApplyDetailPo> purchaseApplyDetailPos = purchaseApplyPo.getPurchaseApplyDetailPos();
         for (PurchaseApplyDetailPo purchaseApplyDetailPo : purchaseApplyDetailPos) {
             purchaseApplyDetailInnerServiceSMOImpl.updatePurchaseApplyDetail(purchaseApplyDetailPo);
@@ -41,6 +61,36 @@ public class ResourceOutBMOImpl implements IResourceOutBMO {
             resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
             resourceStorePo.setStock("-" + purchaseApplyDetailPo.getPurchaseQuantity());
             resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
+
+            ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
+            resourceStoreDto.setResId(purchaseApplyDetailPo.getResId());
+            List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
+
+            if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {
+                continue;
+            }
+            //入库到个人仓库中
+            UserStorehousePo userStorehousePo = new UserStorehousePo();
+            userStorehousePo.setUsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
+            userStorehousePo.setResId(resourceStoreDtos.get(0).getResId());
+            userStorehousePo.setResName(resourceStoreDtos.get(0).getResName());
+            userStorehousePo.setStoreId(resourceStoreDtos.get(0).getStoreId());
+            userStorehousePo.setUserId(purchaseApplyDtos.get(0).getUserId());
+            //查询物品 是否已经存在
+            UserStorehouseDto userStorehouseDto = new UserStorehouseDto();
+            userStorehouseDto.setResId(resourceStoreDtos.get(0).getResId());
+            userStorehouseDto.setUserId(purchaseApplyPo.getUserId());
+            userStorehouseDto.setStoreId(resourceStoreDtos.get(0).getStoreId());
+            List<UserStorehouseDto> userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);
+            if (userStorehouseDtos == null || userStorehouseDtos.size() < 1) {
+                userStorehousePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
+                userStorehouseInnerServiceSMOImpl.saveUserStorehouses(userStorehousePo);
+            } else {
+                int total = Integer.parseInt(purchaseApplyDetailPo.getPurchaseQuantity()) + Integer.parseInt(userStorehouseDtos.get(0).getStock());
+                userStorehousePo.setStock(total + "");
+                userStorehousePo.setUsId(userStorehouseDtos.get(0).getUsId());
+                userStorehouseInnerServiceSMOImpl.updateUserStorehouses(userStorehousePo);
+            }
         }
 
         return ResultVo.createResponseEntity(ResultVo.CODE_OK, "出库成功");

service-store/src/main/java/com/java110/store/dao/IUserStorehouseServiceDao.java

@@ -78,4 +78,6 @@ public interface IUserStorehouseServiceDao {
      */
     int queryUserStorehousesCount(Map info);
 
+    int saveUserStorehouses(Map beanCovertMap);
+
 }

service-store/src/main/java/com/java110/store/dao/impl/UserStorehouseServiceDaoImpl.java

@@ -1,15 +1,14 @@
 package com.java110.store.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.store.dao.IUserStorehouseServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;
-import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.store.dao.IUserStorehouseServiceDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -26,6 +25,7 @@ public class UserStorehouseServiceDaoImpl extends BaseServiceDao implements IUse
 
     /**
      * 个人物品信息封装
+     *
      * @param businessUserStorehouseInfo 个人物品信息 封装
      * @throws DAOException DAO异常
      */
@@ -33,17 +33,18 @@ public class UserStorehouseServiceDaoImpl extends BaseServiceDao implements IUse
     public void saveBusinessUserStorehouseInfo(Map businessUserStorehouseInfo) throws DAOException {
         businessUserStorehouseInfo.put("month", DateUtil.getCurrentMonth());
         // 查询business_user 数据是否已经存在
-        logger.debug("保存个人物品信息 入参 businessUserStorehouseInfo : {}",businessUserStorehouseInfo);
-        int saveFlag = sqlSessionTemplate.insert("userStorehouseServiceDaoImpl.saveBusinessUserStorehouseInfo",businessUserStorehouseInfo);
+        logger.debug("保存个人物品信息 入参 businessUserStorehouseInfo : {}", businessUserStorehouseInfo);
+        int saveFlag = sqlSessionTemplate.insert("userStorehouseServiceDaoImpl.saveBusinessUserStorehouseInfo", businessUserStorehouseInfo);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存个人物品数据失败："+ JSONObject.toJSONString(businessUserStorehouseInfo));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存个人物品数据失败：" + JSONObject.toJSONString(businessUserStorehouseInfo));
         }
     }
 
 
     /**
      * 查询个人物品信息
+     *
      * @param info bId 信息
      * @return 个人物品信息
      * @throws DAOException DAO异常
@@ -51,43 +52,44 @@ public class UserStorehouseServiceDaoImpl extends BaseServiceDao implements IUse
     @Override
     public List<Map> getBusinessUserStorehouseInfo(Map info) throws DAOException {
 
-        logger.debug("查询个人物品信息 入参 info : {}",info);
+        logger.debug("查询个人物品信息 入参 info : {}", info);
 
-        List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.getBusinessUserStorehouseInfo",info);
+        List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.getBusinessUserStorehouseInfo", info);
 
         return businessUserStorehouseInfos;
     }
 
 
-
     /**
      * 保存个人物品信息 到 instance
-     * @param info   bId 信息
+     *
+     * @param info bId 信息
      * @throws DAOException DAO异常
      */
     @Override
     public void saveUserStorehouseInfoInstance(Map info) throws DAOException {
-        logger.debug("保存个人物品信息Instance 入参 info : {}",info);
+        logger.debug("保存个人物品信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.insert("userStorehouseServiceDaoImpl.saveUserStorehouseInfoInstance",info);
+        int saveFlag = sqlSessionTemplate.insert("userStorehouseServiceDaoImpl.saveUserStorehouseInfoInstance", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存个人物品信息Instance数据失败："+ JSONObject.toJSONString(info));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存个人物品信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
 
     /**
      * 查询个人物品信息（instance）
+     *
      * @param info bId 信息
      * @return List<Map>
      * @throws DAOException DAO异常
      */
     @Override
     public List<Map> getUserStorehouseInfo(Map info) throws DAOException {
-        logger.debug("查询个人物品信息 入参 info : {}",info);
+        logger.debug("查询个人物品信息 入参 info : {}", info);
 
-        List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.getUserStorehouseInfo",info);
+        List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.getUserStorehouseInfo", info);
 
         return businessUserStorehouseInfos;
     }
@@ -95,28 +97,30 @@ public class UserStorehouseServiceDaoImpl extends BaseServiceDao implements IUse
 
     /**
      * 修改个人物品信息
+     *
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
     @Override
     public void updateUserStorehouseInfoInstance(Map info) throws DAOException {
-        logger.debug("修改个人物品信息Instance 入参 info : {}",info);
+        logger.debug("修改个人物品信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.update("userStorehouseServiceDaoImpl.updateUserStorehouseInfoInstance",info);
+        int saveFlag = sqlSessionTemplate.update("userStorehouseServiceDaoImpl.updateUserStorehouseInfoInstance", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改个人物品信息Instance数据失败："+ JSONObject.toJSONString(info));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改个人物品信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
-     /**
+    /**
      * 查询个人物品数量
+     *
      * @param info 个人物品信息
      * @return 个人物品数量
      */
     @Override
     public int queryUserStorehousesCount(Map info) {
-        logger.debug("查询个人物品数据 入参 info : {}",info);
+        logger.debug("查询个人物品数据 入参 info : {}", info);
 
         List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.queryUserStorehousesCount", info);
         if (businessUserStorehouseInfos.size() < 1) {
@@ -126,5 +130,16 @@ public class UserStorehouseServiceDaoImpl extends BaseServiceDao implements IUse
         return Integer.parseInt(businessUserStorehouseInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public int saveUserStorehouses(Map info) {
+        logger.debug("保存个人物品信息Instance 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.insert("userStorehouseServiceDaoImpl.saveUserStorehouses", info);
+
+        return saveFlag;
+    }
+
+
+
 
 }

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

@@ -6,6 +6,7 @@ import com.java110.dto.PageDto;
 import com.java110.dto.user.UserDto;
 import com.java110.dto.userStorehouse.UserStorehouseDto;
 import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
+import com.java110.po.userStorehouse.UserStorehousePo;
 import com.java110.store.dao.IUserStorehouseServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,6 @@ public class UserStorehouseInnerServiceSMOImpl extends BaseServiceSMO implements
     private IUserStorehouseServiceDao useStorehouseServiceDaoImpl;
 
 
-
     @Override
     public List<UserStorehouseDto> queryUserStorehouses(@RequestBody UserStorehouseDto userUserStorehousehouseDto) {
 
@@ -82,6 +82,18 @@ public class UserStorehouseInnerServiceSMOImpl extends BaseServiceSMO implements
         return useStorehouseServiceDaoImpl.queryUserStorehousesCount(BeanConvertUtil.beanCovertMap(userUserStorehousehouseDto));
     }
 
+    @Override
+    public int saveUserStorehouses(@RequestBody UserStorehousePo userStorehousePo) {
+        return useStorehouseServiceDaoImpl.saveUserStorehouses(BeanConvertUtil.beanCovertMap(userStorehousePo));
+    }
+
+    @Override
+    public int updateUserStorehouses(@RequestBody UserStorehousePo userStorehousePo) {
+        int flag = 1;
+        useStorehouseServiceDaoImpl.updateUserStorehouseInfoInstance(BeanConvertUtil.beanCovertMap(userStorehousePo));
+        return flag;
+    }
+
     public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
         return useStorehouseServiceDaoImpl;
     }