From 41b107ba7acd40fa32ce9ec8f103dfe1061ecf4e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 03 Sep 2025 16:52:33 +0800
Subject: [PATCH] 初始化修改

---
 trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java |  193 +++++++++++++++++++++++++-----------------------
 1 files changed, 101 insertions(+), 92 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
index 4084f60..3bb5ed7 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
@@ -1,10 +1,7 @@
 package com.yami.trading.service.ico;
 
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yami.trading.bean.ico.domain.Ico;
 import com.yami.trading.bean.ico.domain.UserSubscription;
@@ -22,16 +19,12 @@
 import com.yami.trading.service.MoneyLogService;
 import com.yami.trading.service.WalletService;
 import com.yami.trading.service.user.UserService;
-import com.yami.trading.service.user.WalletExtendService;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -56,66 +49,59 @@
     @Autowired
     MoneyLogService moneyLogService;
 
-    @Autowired
-    WalletExtendService walletExtendService;
-
     /**
      * 新币申购
-     * @param model
-     * @return
      */
     public Result<String> subscribe(UserSubscription model) {
-        try {
-            if (model == null || model.getIcoProjectId() == null) {
-                throw new YamiShopBindException("参数异常");
-            }
-            String partyId = model.getUserId();
-            Ico ico = this.getById(model.getIcoProjectId());
-            if (ico == null) {
-                throw new YamiShopBindException("新币不存在");
-            }
+        if (model == null || model.getIcoProjectId() == null) {
+            throw new YamiShopBindException("参数异常");
+        }
+        String partyId = model.getUserId();
+        Ico ico = this.getById(model.getIcoProjectId());
+        if (ico == null) {
+            throw new YamiShopBindException("新币不存在");
+        }
 
-            User party = userService.getById(partyId);
-            if (!party.isEnabled()) {
-                return Result.succeed("User is locked");
-            }
-            if (Constants.SECURITY_ROLE_TEST.equals(party.getRoleName())) {
-                throw new YamiShopBindException("无权限");
-            }
-            if (!C2cLock.add(partyId)) {
-                throw new YamiShopBindException("Please try again later");
-            }
+        User party = userService.getById(partyId);
+        if (!party.isEnabled()) {
+            throw new YamiShopBindException("User is locked");
+        }
+        if (Constants.SECURITY_ROLE_TEST.equals(party.getRoleName())) {
+            throw new YamiShopBindException("无权限");
+        }
 
-            if (model.getSubscribeNums() == null || model.getSubscribeNums() == 0) {
-                throw new YamiShopBindException("申请数量不能为空");
-            }
-            //购买金额
-            BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(model.getSubscribeNums()));
-            /*Wallet wallet = walletService.saveWalletByPartyId(partyId);
+        if (model.getSubscribeNums() == null || model.getSubscribeNums() == 0) {
+            throw new YamiShopBindException("申请数量不能为空");
+        }
+        //购买金额
+        BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(model.getSubscribeNums()));
+        if(amount.compareTo(ico.getMinContribution()) < 0 ){
+            throw new YamiShopBindException("最低投资额: " + ico.getMinContribution());
+        }
+        if(amount.compareTo(ico.getMaxContribution()) > 0 ){
+            throw new YamiShopBindException("最高投资额: " + ico.getMaxContribution());
+        }
+        Date currentDate = new Date();
+        if(currentDate.before(ico.getStartDate())){
+            throw new YamiShopBindException("未开售");
+        }
+        if(currentDate.after(ico.getEndDate())){
+            throw new YamiShopBindException("已结束");
+        }
+
+        model.setStatus(1);
+        model.setUserId(partyId);
+        if (model.getSubscriptionType() == null) { //默认自主申购
+            model.setSubscriptionType(1);
+        }
+
+        //需要先支付
+        if (ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
+            Wallet wallet = walletService.saveWalletByPartyId(partyId);
             if (amount.compareTo(wallet.getMoney()) > 0) {
                 throw new YamiShopBindException("余额不足");
-            }*/
-            if(amount.compareTo(ico.getMinContribution()) < 0 ){
-                throw new YamiShopBindException("最低投资额: " + ico.getMinContribution());
             }
-            if(amount.compareTo(ico.getMaxContribution()) > 0 ){
-                throw new YamiShopBindException("最高投资额: " + ico.getMaxContribution());
-            }
-            Date currentDate = new Date();
-            if(currentDate.before(ico.getStartDate())){
-                throw new YamiShopBindException("未开售");
-            }
-            if(currentDate.after(ico.getEndDate())){
-                throw new YamiShopBindException("已结束");
-            }
-
-            model.setStatus(1);
-            model.setUserId(partyId);
-            if (model.getSubscriptionType() == null) { //默认自主申购
-                model.setSubscriptionType(1);
-            }
-            userSubscriptionService.save(model);
-            /*walletService.update(partyId, Arith.sub(0, amount.doubleValue()));
+            walletService.update(partyId, Arith.sub(0, amount.doubleValue()));
 
             // 保存 资金日志
             MoneyLog moneylog = new MoneyLog();
@@ -127,12 +113,11 @@
             moneylog.setUserId(partyId);
             moneylog.setSymbol(ico.getSymbol());
             moneylog.setWalletType(ico.getSymbol());
-            moneylog.setContentType(Constants.MONEYLOG_CONTENT_NEW_COIN_OPEN);
-            moneyLogService.save(moneylog);*/
-            return Result.ok("申请成功" );
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+            moneylog.setContentType(Constants.MONEYLOG_CONTENT_NEW_COIN_BUY);
+            moneyLogService.save(moneylog);
         }
+        userSubscriptionService.save(model);
+        return Result.ok("申请成功" );
     }
 
 
@@ -154,7 +139,8 @@
             if(userSubscription.getStatus() == 3){
                 throw new YamiShopBindException("不能更改申购状态");
             }
-            Ico ico = this.getById(model.getIcoProjectId());
+            Ico ico = this.getById(userSubscription.getIcoProjectId());
+            String userId = userSubscription.getUserId();
             if (model.getStatus() == 3 || model.getStatus() == 5) {
                 if(model.getBallotNumber() == null || model.getBallotNumber() == 0){
                     throw new YamiShopBindException("中签数量不能小于0");
@@ -166,42 +152,65 @@
             userSubscription.setStatus(model.getStatus());
             userSubscription.setBallotNumber(model.getBallotNumber());
             if (model.getStatus() == 3) { //中签
-                int applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber();
-                BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
                 //资金账户
-                Wallet wallet = walletService.saveWalletByPartyId(userSubscription.getUserId());
-                BigDecimal subtract = amount.subtract(wallet.getMoney());
-                if (subtract.compareTo(BigDecimal.ZERO) > 0) {
-                    //放入待补
-                    wallet.setMoney(BigDecimal.ZERO);
-                    wallet.setAmountToBeCovered(subtract);
-                    if (!walletService.updateById(wallet)) {
-                        throw new YamiShopBindException("操作钱包失败!");
+                Wallet wallet = walletService.saveWalletByPartyId(userId);
+                //已经预支付
+                if(ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
+                    int applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber();
+                    BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
+                    if(applyNumber > 0) {
+                        //退回资金
+                        BigDecimal refundPrice = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
+                        walletService.update(userId, refundPrice.doubleValue());
+
+                        //保存 资金日志
+                        MoneyLog moneylog = new MoneyLog();
+                        moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
+                        moneylog.setAmountBefore(wallet.getMoney());
+                        moneylog.setAmount(amount);
+                        moneylog.setAmountAfter(wallet.getMoney().add(refundPrice));
+                        moneylog.setLog("新币购买,退回购买金额[" + refundPrice + "]");
+                        moneylog.setUserId(userId);
+                        moneylog.setSymbol(ico.getSymbol());
+                        moneylog.setWalletType(ico.getSymbol());
+                        moneylog.setContentType(Constants.MONEYLOG_CONTENT_NEW_COIN_RT_BUY);
+                        moneyLogService.save(moneylog);
                     }
                 } else {
-                    //扣除资金
-                    walletService.update(userSubscription.getUserId(), amount.negate().doubleValue());
+                    BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(model.getBallotNumber()));
+                    BigDecimal subtract = amount.subtract(wallet.getMoney());
+                    if (subtract.compareTo(BigDecimal.ZERO) > 0) {
+                        //放入待补
+                        wallet.setMoney(BigDecimal.ZERO);
+                        wallet.setAmountToBeCovered(subtract);
+                        if (!walletService.updateById(wallet)) {
+                            throw new YamiShopBindException("操作钱包失败!");
+                        }
+                    } else {
+                        //扣除资金
+                        walletService.update(userId, amount.negate().doubleValue());
+                    }
+                    //保存 资金日志
+                    MoneyLog moneylog = new MoneyLog();
+                    moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
+                    moneylog.setAmountBefore(wallet.getMoney());
+                    moneylog.setAmount(amount);
+                    moneylog.setAmountAfter(subtract.compareTo(BigDecimal.ZERO) > 0 ? BigDecimal.ZERO : subtract.negate());
+                    moneylog.setLog("新币购买,申购金额[" + amount + "]");
+                    moneylog.setUserId(userId);
+                    moneylog.setSymbol(ico.getSymbol());
+                    moneylog.setWalletType(ico.getSymbol());
+                    moneylog.setContentType(Constants.MONEYLOG_CONTENT_NEW_COIN_BUY);
+                    moneyLogService.save(moneylog);
                 }
-                //保存 资金日志
-                MoneyLog moneylog = new MoneyLog();
-                moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
-                moneylog.setAmountBefore(wallet.getMoney());
-                moneylog.setAmount(amount);
-                moneylog.setAmountAfter(BigDecimal.valueOf(Arith.sub(wallet.getMoney().doubleValue(), amount.doubleValue())));
-                moneylog.setLog("新币购买,申购金额[" + amount + "]");
-                moneylog.setUserId(userSubscription.getUserId());
-                moneylog.setSymbol(ico.getSymbol());
-                moneylog.setWalletType(ico.getSymbol());
-                moneylog.setContentType(Constants.MONEYLOG_CONTENT_NEW_COIN_OPEN);
-                moneyLogService.save(moneylog);
                 userSubscription.setStatus(5);
             }
             if (model.getStatus() == 3 || model.getStatus() == 5) {  //转入账户
                 //获取币账户
-                WalletExtend walletExtend = walletService.saveExtendByPara(userSubscription.getUserId(), ico.getSymbol());
-                walletService.updateExtend(userSubscription.getUserId(), walletExtend.getWallettype(), model.getBallotNumber());
+                WalletExtend walletExtend = walletService.saveExtendByPara(userId, ico.getSymbol());
+                walletService.updateExtend(userId, walletExtend.getWallettype(), model.getBallotNumber());
             }
-            userSubscriptionService.save(userSubscription);
+            userSubscriptionService.saveOrUpdate(userSubscription);
             return Result.ok ( "操作成功" );
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -227,7 +236,7 @@
         item.setShowStatus("1");
         item.setTradeStatus("1");
         item.setQuoteCurrency(ico.getCurrency());
-        item.setCurrencyType(0);
+        item.setCurrencyType(1);  //新币
         item.setStatus(0);
         item.setTradeType(ico.getIsContractTrading().toString());
         return item;

--
Gitblit v1.9.3