多图分享修改

admin

2019-12-03 ad1c19461fee4c7c4a26795bef75d26f9738faf1

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java

@@ -115,6 +115,7 @@
   

   /**

    * 根据主键 、uid 批量删除

    * 
    * @param list

    * @return

    */

@@ -184,7 +185,6 @@
            }

         }

         

			
         if (commonGoods != null) {

            try {

               commonGoodsService.addOrUpdateCommonGoods(commonGoods);

@@ -204,7 +204,8 @@
               userGoodsStorageMapper.updateByPrimaryKeySelective(goodsStorage);

            } else {

               goodsStorage = new UserGoodsStorage();

               goodsStorage.setUid(uid);;

               goodsStorage.setUid(uid);

               ;

               goodsStorage.setState(UserGoodsStorage.STATE_NORMAL);

               goodsStorage.setCommonGoods(commonGoods);

               goodsStorage.setCreateTime(new Date());

@@ -214,7 +215,6 @@
         }

      }

   }



   

   @Override

   @Transactional

@@ -240,7 +240,8 @@
               userGoodsStorageMapper.updateByPrimaryKeySelective(goodsStorage);

            } else {

               goodsStorage = new UserGoodsStorage();

               goodsStorage.setUid(uid);;

               goodsStorage.setUid(uid);

               ;

               goodsStorage.setState(UserGoodsStorage.STATE_NORMAL);

               goodsStorage.setCommonGoods(commonGoods);

               goodsStorage.setCreateTime(new Date());

@@ -250,7 +251,6 @@
         }

      }

   }



   

   @Override

   public JSONArray getMyStorage(int page, int pageSize, Long uid, Integer source) throws UserGoodsStorageException {

@@ -289,7 +289,6 @@
         }

      }

      

		
      BigDecimal  rate = manageService.getFanLiRate();

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

@@ -300,12 +299,11 @@
            continue;

         }

         

			
         int state = 0;

         Integer goodsType = commonGoods.getGoodsType();

         

         if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 
               && goodsType != null && goodsType == Constant.SOURCE_TYPE_TAOBAO) {

         if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 && goodsType != null

               && goodsType == Constant.SOURCE_TYPE_TAOBAO) {

            state = 1;  // 默认停售

            Long goodsId = commonGoods.getGoodsId();

            for (TaoBaoGoodsBrief taoKeGoods: listTaoKeGoods) {

@@ -338,7 +336,6 @@
      

      return array;

   }

	
   

   @Override

   public boolean isExistStorage(Long uid, Long auctionId, Integer goodType) {

@@ -385,7 +382,8 @@
         totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);

      }

      

      ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorage(uid, listGoodsBrief, listStorageID);

      ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorage(uid, listGoodsBrief,

            listStorageID);

      FileUploadResult uploadResult = new FileUploadResult();

      uploadResult.setUrl(shareRecord.getSharePictureUrl());

      

@@ -397,10 +395,9 @@
      return data;

   }

   

	
	
   @Override

   public JSONObject createShareV2(Long uid, List<Long> listStorageID) throws UserGoodsStorageException, UserShareGoodsRecordException {

   public JSONObject createShareV2(Long uid, List<Long> listStorageID, boolean needDrawPicture)

         throws UserGoodsStorageException, UserShareGoodsRecordException {

      List<UserGoodsStorage> listStorage = userGoodsStorageMapper.listQueryByIds(listStorageID);

      if (listStorage == null || listStorage.size() == 0) {

         throw new UserGoodsStorageException(1, "选品库商品不存在");

@@ -434,7 +431,8 @@
         }

      }

      

      ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorageV2(uid, listCommonGoods, listStorageID);

      ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorageV2(uid, listCommonGoods,

            listStorageID, needDrawPicture);

      FileUploadResult uploadResult = new FileUploadResult();

      uploadResult.setUrl(shareRecord.getSharePictureUrl());