wangqifan преди 3 години
родител
ревизия
a0c2eb46b6

+ 2 - 0
src/main/java/com/izouma/nineth/domain/DomainOrder.java

@@ -71,4 +71,6 @@ public class DomainOrder extends BaseEntity {
 
     @ExcelProperty("价格")
     private BigDecimal price;
+
+    private Long years;
 }

+ 5 - 4
src/main/java/com/izouma/nineth/service/DomainOrderService.java

@@ -53,7 +53,7 @@ public class DomainOrderService {
         return false;
     }
 
-    public DomainOrder create(Long userId, String domain, BigDecimal price) {
+    public DomainOrder create(Long userId, String domain, BigDecimal price, Long year) {
         List<DomainOrder> notPaidOrders = domainOrderRepo.findAllByUserIdAndOrderStatus(userId, OrderStatus.NOT_PAID);
         Long superUserId = Long.valueOf(sysConfigService.getString("domain_superUserId"));
         if (!superUserId.equals(SecurityUtils.getAuthenticatedUser().getId())) {
@@ -71,9 +71,9 @@ public class DomainOrderService {
         if (!(Boolean) checkResult.get("result")) {
             throw new BusinessException(checkResult.get("reason").toString());
         }
-        if (price.compareTo(BigDecimal.valueOf(40L)) != 0) {
-            throw new BusinessException("订单价格与配置不符,请重新下单.");
-        }
+//        if (price.compareTo(BigDecimal.valueOf(40L)) != 0) {
+//            throw new BusinessException("订单价格与配置不符,请重新下单.");
+//        }
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("未找到用户"));
         if (domain.contains(".")) {
             int dotIndex = domain.indexOf(".");
@@ -88,6 +88,7 @@ public class DomainOrderService {
         domainOrder.setPicName(domain);
         domainOrder.setPrice(price);
         domainOrder.setDomainName(domain + ".nft");
+        domainOrder.setYears(year);
         domainOrder.setStatus(CollectionStatus.PENDING);
         domainOrder.setOrderStatus(OrderStatus.NOT_PAID);
         domainOrder.setUserId(user.getId());

+ 2 - 2
src/main/java/com/izouma/nineth/web/DomainOrderController.java

@@ -44,8 +44,8 @@ public class DomainOrderController extends BaseController {
     }
 
     @PostMapping("/create")
-    public DomainOrder create(Long userId, String domain, BigDecimal price) {
-        return domainOrderService.create(userId, domain, price);
+    public DomainOrder create(Long userId, String domain, BigDecimal price, Long year) {
+        return domainOrderService.create(userId, domain, price, year);
     }
 
     @PostMapping("/search")