linweichao 1 hete
szülő
commit
022f4c3ba8

+ 16 - 0
qnfhq-api/src/main/java/com/qnfhq/modules/business/entity/AddMosaicSetting.java

@@ -0,0 +1,16 @@
+package com.qnfhq.modules.business.entity;
+
+import lombok.Data;
+
+/**
+ * 底部菜单
+ */
+@Data
+public class AddMosaicSetting {
+    private Boolean isOpen; //总开关
+    private Boolean sencordIsOpen; //秒合约开关
+    private Boolean currencyIsOpen; //币币开关
+    private Boolean contractIsOpen; //u本位开关
+    private Boolean financialIsOpen; //理财开关
+    private Boolean pledgeIsOpen; //质押开关
+}

+ 23 - 7
qnfhq-api/src/main/java/com/qnfhq/modules/business/service/impl/TMingOrderServiceImpl.java

@@ -1,11 +1,14 @@
 package com.qnfhq.modules.business.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.setting.Setting;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qnfhq.common.utils.DateUtil;
 import com.qnfhq.common.utils.MessageUtils;
 import com.qnfhq.modules.business.dao.TMingProductUserMapper;
+import com.qnfhq.modules.business.entity.AddMosaicSetting;
 import com.qnfhq.modules.business.entity.MingProduct;
 import com.qnfhq.modules.business.entity.MingProductUser;
 import com.qnfhq.modules.business.entity.TMingOrder;
@@ -16,15 +19,21 @@ import com.qnfhq.modules.user.dao.AppAssetDao;
 import com.qnfhq.modules.user.entity.AppAssetEntity;
 import com.qnfhq.modules.user.entity.AppUserDetailEntity;
 import com.qnfhq.modules.user.entity.AppUserEntity;
+import com.qnfhq.modules.user.entity.SettingEntity;
 import com.qnfhq.modules.user.enums.AssetEnum;
+import com.qnfhq.modules.user.enums.RecordEnum;
+import com.qnfhq.modules.user.enums.SettingEnum;
 import com.qnfhq.modules.user.service.AppUserService;
 import com.qnfhq.modules.user.service.AppWalletRecordService;
+import com.qnfhq.modules.user.service.SettingService;
 import com.qnfhq.utils.OrderUtils;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -53,6 +62,10 @@ public class TMingOrderServiceImpl extends ServiceImpl<TMingOrderMapper, TMingOr
     @Resource
     private TMingProductUserMapper tMingProductUserMapper;
 
+    @Resource
+    private SettingService settingService;
+
+
     @Override
     public String bugMingOrder(Long planId, BigDecimal amount, Long userId) {
         //获取用户信息
@@ -149,15 +162,18 @@ public class TMingOrderServiceImpl extends ServiceImpl<TMingOrderMapper, TMingOr
         mineOrder.setAdminUserIds(user.getAdminParentIds());
         mineOrder.setUserId(user.getId());
         mineOrder.setStatus(0);
+
         //  先扣钱,再下单
+        Map<String, Object> map = new HashMap<>();
+        map.put("userId", userId);
+        map.put("symbol", tMingProduct.getCoin());
+        map.put("money", amount);
+        map.put("type", AssetEnum.PLATFORM_ASSETS.getCode());
+        appAssetDao.releaseAssetByUserId(map);
+        BigDecimal bigDecimal = tAppAsset.getAvailable();
 
-        /*appAssetService.reduceAssetByUserId(user.getUserId(),tMingProduct.getCoin(),amount);
-        BigDecimal bigDecimal = tAppAsset.getAvailableAmount();
-         tAppAsset.setAmout(tAppAsset.getAmout().subtract(amount));
-         tAppAsset.setAvailableAmount(bigDecimal.subtract(amount));
-         appAssetService.updateTAppAsset(tAppAsset); *
 
-        appWalletRecordService.generateRecord(user.getUserId(),
+        appWalletRecordService.generateRecord(user.getId(),
                 amount,
                 RecordEnum.PLEDGE_RECHARGE.getCode(),
                 user.getLoginName(),
@@ -165,7 +181,7 @@ public class TMingOrderServiceImpl extends ServiceImpl<TMingOrderMapper, TMingOr
                 "质押认购", bigDecimal, bigDecimal.subtract(amount), tMingProduct.getCoin().toLowerCase(), user.getAdminParentIds());
         tMingOrderMapper.insert(mineOrder);
         //质押打码
-        Setting setting = settingService.get(SettingEnum.ADD_MOSAIC_SETTING.name());
+       /* SettingEntity setting = settingService.getSetting(SettingEnum.ADD_MOSAIC_SETTING.name());
         if (Objects.nonNull(setting)){
             AddMosaicSetting addMosaic = JSONUtil.toBean(setting.getSettingValue(), AddMosaicSetting.class);
             if (Objects.nonNull(addMosaic) && Objects.nonNull(addMosaic.getIsOpen()) && addMosaic.getIsOpen() && Objects.nonNull(addMosaic.getPledgeIsOpen()) && addMosaic.getPledgeIsOpen()){

+ 7 - 1
qnfhq-api/src/main/java/com/qnfhq/modules/user/dao/AppAssetDao.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qnfhq.modules.user.entity.AppAssetEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -43,4 +46,7 @@ public interface AppAssetDao extends BaseMapper<AppAssetEntity> {
      * @return
      */
     int releaseAssetByUserId(Map<String, Object> params);
-}
+
+
+
+ }

+ 10 - 4
qnfhq-api/src/main/java/com/qnfhq/modules/user/enums/RecordEnum.java

@@ -50,6 +50,15 @@ public enum RecordEnum {
     FINANCIAL_REDEMPTION(55, "理财赎回"),
     C2C_TRAN_BUY(56, "C2C交易买入+平台资产"),
     C2C_TRAN_SELL(57, "C2C交易卖出-平台资产"),
+    EARN_COIN_BUY(58, "赚币交易买入+平台资产"),
+    EARN_COIN_SELL(59, "赚币交易赎回+平台资产"),
+    EARN_COIN_SETTLE(63, "赚币交易结算+平台资产"),
+
+    PLEDGE_RECHARGE(60, "质押认购"),
+
+    PLEDGE_Profit(61, "质押收益"),
+
+    PLEDGE_Profit_SETTLE(62, "质押结算"),
     ;
     private final Integer code;
     private final String desc;
@@ -77,8 +86,5 @@ public enum RecordEnum {
 
     }
 
-    public static void main(String[] args) {
-        LinkedHashMap<Integer, String> map = getMap();
-        System.out.println(map);
-    }
+
 }

+ 3 - 0
qnfhq-api/src/main/java/com/qnfhq/modules/user/service/SettingService.java

@@ -1,5 +1,6 @@
 package com.qnfhq.modules.user.service;
 
+import cn.hutool.setting.Setting;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qnfhq.modules.user.entity.SettingEntity;
 
@@ -11,4 +12,6 @@ import com.qnfhq.modules.user.entity.SettingEntity;
  */
 public interface SettingService extends IService<SettingEntity> {
     SettingEntity getSetting(String id);
+
+
 }

+ 2 - 0
qnfhq-api/src/main/java/com/qnfhq/modules/user/service/impl/SettingServiceImpl.java

@@ -34,4 +34,6 @@ public class SettingServiceImpl extends ServiceImpl<SettingDao, SettingEntity> i
         return getById(id);
     }
 
+
+
 }

+ 1 - 0
qnfhq-api/src/main/resources/mapper/user/AppAssetDao.xml

@@ -62,4 +62,5 @@
         where user_id = #{userId} and symbol =#{symbol} and type=#{type}
     </update>
 
+
 </mapper>