Merge branch 'master' of wangqifan/nanjing_nft into dev

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -184,9 +184,9 @@ public class AssetService {
             throw new BusinessException("需持有满" + holdDays + "天才能寄售上架");
         }
         User owner = userRepo.findById(asset.getUserId()).orElseThrow(new BusinessException("用户不存在"));
-//        if (StringUtils.isBlank(owner.getSettleAccountId())) {
-//            throw new BusinessException("请先绑定银行卡");
-//        }
+        if (StringUtils.isBlank(owner.getSettleAccountId())) {
+            throw new BusinessException("请先绑定银行卡");
+        }
         if (asset.isConsignment()) {
             throw new BusinessException("已寄售，请勿重新操作");
         }

src/main/java/com/izouma/nineth/service/SandPayService.java

@@ -266,9 +266,9 @@ public class SandPayService {
         if (order.getStatus() != OrderStatus.NOT_PAID) {
             throw new BusinessException("订单状态错误");
         }
-        if (order.getSource().equals(CollectionSource.TRANSFER)) {
-            throw new BusinessException("二级市场暂未开放");
-        }
+//        if (order.getSource().equals(CollectionSource.TRANSFER)) {
+//            throw new BusinessException("二级市场暂未开放");
+//        }
         JSONObject extend = new JSONObject();
         extend.put("type", "order");
         extend.put("id", orderId);

src/main/java/com/izouma/nineth/service/UserService.java

@@ -595,10 +595,10 @@ public class UserService {
                 .build());
     }
 
-    public void removeBankCard(Long userId) throws BaseAdaPayException {
+    public void removeBankCard(Long userId) {
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
         if (StringUtils.isNotBlank(user.getSettleAccountId()) && StringUtils.isNotBlank(user.getMemberId())) {
-            adapayMerchantService.delSettleAccountForAll(user.getMemberId());
+//            adapayMerchantService.delSettleAccountForAll(user.getMemberId());
             user.setSettleAccountId(null);
             save(user);
             userBankCardRepo.deleteByUserId(userId);

src/main/java/com/izouma/nineth/web/UserController.java

@@ -217,7 +217,7 @@ public class UserController extends BaseController {
     }
 
     @PostMapping("/removeBankCard")
-    public void removeBankCard() throws BaseAdaPayException {
+    public void removeBankCard() {
         userService.removeBankCard(SecurityUtils.getAuthenticatedUser().getId());
     }