质押

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

@@ -14,7 +14,7 @@ import com.qnfhq.modules.business.service.ITMingOrderService;
 import com.qnfhq.modules.business.service.ITMingProductService;
 import com.qnfhq.modules.user.dao.AppAssetDao;
 import com.qnfhq.modules.user.entity.AppAssetEntity;
-import com.qnfhq.modules.user.entity.AppUserDetail;
+import com.qnfhq.modules.user.entity.AppUserDetailEntity;
 import com.qnfhq.modules.user.entity.AppUserEntity;
 import com.qnfhq.modules.user.enums.AssetEnum;
 import com.qnfhq.modules.user.service.AppUserService;
@@ -58,7 +58,7 @@ public class TMingOrderServiceImpl extends ServiceImpl<TMingOrderMapper, TMingOr
         //获取用户信息
         AppUserEntity user = appUserService.getUserByUserId(userId);
         //获取用户详情
-        AppUserDetail tAppUserDetail = appUserService.selectUserDetailByUserId(userId);
+        AppUserDetailEntity tAppUserDetail = appUserService.selectUserDetailByUserId(userId);
         Integer tradeFlag = tAppUserDetail.getTradeFlag();
         if (null != tradeFlag) {
             if (1 == tradeFlag) {

qnfhq-api/src/main/java/com/qnfhq/modules/user/entity/AppUserDetail.java

@@ -1,133 +0,0 @@
-package com.qnfhq.modules.user.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.qnfhq.common.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 用户详细信息对象 t_app_user_detail
- *
- * @author table
- * @date 2023-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("t_app_user_detail")
-public class AppUserDetail extends BaseEntity {
-
-private static final long serialVersionUID=1L;
-
-    /**
-     *
-     */
-    @TableId(value = "id",type = IdType.AUTO)
-    private Long id;
-    /**
-     *
-     */
-    private Long userId;
-    /**
-     * 真实姓名
-     */
-    private String realName;
-    /**
-     * 身份证号码
-     */
-    private String idCard;
-    /**
-     * 身份证正面照片
-     */
-    private String frontUrl;
-    /**
-     * 国际
-     */
-    private String country;
-    /**
-     * 1 身份证  2 护照  3其他
-     */
-    private String cardType;
-    /**
-     * 手持身份证照片
-     */
-    private String handelUrl;
-    /**
-     * 身份证反面照片
-     */
-    private String backUrl;
-    /**
-     * 用户交易密码
-     */
-    private String userTardPwd;
-    /**
-     *
-     */
-    private String searchValue;
-    /**
-     * AuditStatusEnum
-     */
-    private String auditStatusPrimary;
-    /**
-     * AuditStatusEnum
-     */
-    private String auditStatusAdvanced;
-    /**
-     * 信用分
-     */
-    private Integer credits;
-    /**
-     * 用户充值地址
-     */
-    private String userRechargeAddress;
-
-    /**
-     * 连赢场次
-     */
-    private Integer winNum;
-    /**
-     * 连输场次
-     */
-    private Integer loseNum;
-    /**
-     * 交易是否被限制 1 为限制
-     */
-    private Integer tradeFlag;
-    /**
-     * 金额是否被限制 1 为限制
-     */
-    private Integer amountFlag;
-    /**
-     * 金额限制提示语
-     */
-    private String pushMessage;
-    /**
-     * 交易限制提示语
-     */
-    private String tradeMessage;
-    /**
-     * 实名认证时间
-     */
-    private Date operateTime;
-
-    /**
-     * 重新实名认证次数
-     */
-    private Integer reKyc;
-
-    //业务字段
-    @TableField(exist = false)
-    private String flag;
-
-    //业务字段
-    @TableField(exist = false)
-    private String adminParentIds;
-
-    //业务字段  1 初级  2  高级
-    @TableField(exist = false)
-    private Integer reSetFlag;
-}

qnfhq-api/src/main/java/com/qnfhq/modules/user/entity/AppUserDetailEntity.java

@@ -89,7 +89,7 @@ public class AppUserDetailEntity implements Serializable {
     /**
      * 交易是否被限制 1 为限制
      */
-	private String tradeFlag;
+	private Integer tradeFlag;
     /**
      * 金额是否被限制 1 为限制
      */

qnfhq-api/src/main/java/com/qnfhq/modules/user/service/AppUserService.java

@@ -3,7 +3,7 @@ package com.qnfhq.modules.user.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qnfhq.common.utils.Result;
 import com.qnfhq.modules.user.dto.*;
-import com.qnfhq.modules.user.entity.AppUserDetail;
+import com.qnfhq.modules.user.entity.AppUserDetailEntity;
 import com.qnfhq.modules.user.entity.AppUserEntity;
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -74,7 +74,7 @@ public interface AppUserService extends IService<AppUserEntity> {
     Result resetPwdByEmail(ResetPwdByEmailDTO codeDTO);
     Result resetPwdByPhone(ResetPwdByPhoneDTO codeDTO);
 
-    AppUserDetail selectUserDetailByUserId(Long userId);
+    AppUserDetailEntity selectUserDetailByUserId(Long userId);
     Result checkCaptcha(CheckCaptchaDTO dto, HttpServletRequest request);
 
     Result checkPhoneCode(String codeType,String zone,String phone,String code);

qnfhq-api/src/main/java/com/qnfhq/modules/user/service/impl/AppUserServiceImpl.java

@@ -15,6 +15,7 @@ import com.qnfhq.common.utils.MessageUtils;
 import com.qnfhq.common.utils.Result;
 import com.qnfhq.constant.ApiConstant;
 import com.qnfhq.modules.user.dao.AppUserDao;
+import com.qnfhq.modules.user.dao.AppUserDetailDao;
 import com.qnfhq.modules.user.dto.*;
 import com.qnfhq.modules.user.dto.setting.AssetSymbolSetting;
 import com.qnfhq.modules.user.entity.AppAssetEntity;
@@ -75,6 +76,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserDao, AppUserEntity> i
     @Resource
     private CaptchaService captchaService;
 
+    @Resource
+    private AppUserDetailDao appUserDetailDao;
+
     @Override
     public AppUserEntity getUserByEmail(String email) {
         return getOne(new LambdaQueryWrapper<AppUserEntity>()
@@ -532,6 +536,12 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserDao, AppUserEntity> i
 
     }
 
+    @Override
+    public AppUserDetailEntity selectUserDetailByUserId(Long userId) {
+        return appUserDetailDao.selectOne(new LambdaQueryWrapper<AppUserDetailEntity>().eq(AppUserDetailEntity::getUserId, userId));
+
+    }
+
     /**
      * 限制验证码重试次数
      */