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

@@ -7,8 +7,10 @@ import com.izouma.nineth.config.SandPayProperties;
 import com.izouma.nineth.domain.GiftOrder;
 import com.izouma.nineth.domain.MintOrder;
 import com.izouma.nineth.domain.Order;
+import com.izouma.nineth.enums.CollectionSource;
 import com.izouma.nineth.enums.MintOrderStatus;
 import com.izouma.nineth.enums.OrderStatus;
+import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.GiftOrderRepo;
 import com.izouma.nineth.repo.MintOrderRepo;
@@ -18,6 +20,7 @@ import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -43,6 +46,7 @@ public class SandPayService {
     private final MintOrderRepo     mintOrderRepo;
     private final SnowflakeIdWorker snowflakeIdWorker;
     private final GeneralProperties generalProperties;
+    private final GiftOrderService  giftOrderService;
 
     public String paddingOrderId(String orderId) {
         if (orderId != null && orderId.length() < 12) {
@@ -262,6 +266,9 @@ public class SandPayService {
         if (order.getStatus() != OrderStatus.NOT_PAID) {
             throw new BusinessException("订单状态错误");
         }
+        if (order.getSource().equals(CollectionSource.TRANSFER)) {
+            throw new BusinessException("二级市场暂未开放");
+        }
         JSONObject extend = new JSONObject();
         extend.put("type", "order");
         extend.put("id", orderId);
@@ -377,6 +384,10 @@ public class SandPayService {
         if (order.getStatus() != OrderStatus.NOT_PAID) {
             throw new BusinessException("订单状态错误");
         }
+        if (order.getGasPrice().compareTo(BigDecimal.ZERO) == 0) {
+            giftOrderService.giftNotify(orderId, PayMethod.ALIPAY, order.getId().toString());
+            return "nopay";
+        }
         JSONObject extend = new JSONObject();
         extend.put("type", "gift");
         extend.put("id", orderId);
@@ -431,7 +442,6 @@ public class SandPayService {
     }
 
 
-
     public JSONObject transfer(String id, String name, String bank, BigDecimal amount) {
         JSONObject request = new JSONObject();
         DecimalFormat df = new DecimalFormat("000000000000", DecimalFormatSymbols.getInstance(Locale.US));

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

@@ -578,6 +578,10 @@ public class UserService {
         user.setSettleAccountId(Optional.ofNullable(accountId).orElse("1"));
         save(user);*/
 
+        user.setMemberId(user.getId().toString());
+        user.setSettleAccountId("1");
+        save(user);
+
         userBankCardRepo.save(UserBankCard.builder()
                 .bank(bankValidate.getBank())
                 .bankName(bankValidate.getBankName())

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

@@ -105,7 +105,7 @@ public class AssetController extends BaseController {
     @PostMapping("/gift")
     @ApiOperation("转赠")
     public GiftOrder gift(@RequestParam Long assetId, @RequestParam Long toUserId) {
-        return giftOrderService.gift(SecurityUtils.getAuthenticatedUser().getId(), assetId, toUserId);
+        return null;
     }
 
     @GetMapping("/tokenHistory")