wangqifan 3 年之前
父节点
当前提交
876e906be8

+ 3 - 3
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);

+ 2 - 2
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);

+ 1 - 1
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());
     }