Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-22 1011d9d0aaab0e978caf4513b64f0a369bcd9a96

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java

@@ -57,9 +57,12 @@
         out.print(JsonUtil.loadFalseResult("用户未登录"));

         return;

      }



		
      if (goodsType == null) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      }

		
      try {

         goodsType = 2;

         UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, goodsType);

         boolean storageState = false;

         if (userGoodsStorage != null) {

@@ -103,6 +106,9 @@
            return;

         }



         if (goodsType == null) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

         }

         userGoodsStorageService.save(uid, set, goodsType);

         out.print(JsonUtil.loadTrueResult("添加成功"));