提现bug修改

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1233,22 +1233,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             addDeptUser(sysUser,grade);
         }
         sysUser.setDeptId(sysUser.getDeptId());
-        //1：合伙人 2：工作室管理员
-        Integer type = sysUser.getType();
-        // 手机号
-        List<SysUser> mobileList = lambdaQuery().eq(SysUser::getMobile, sysUser.getMobile())
-                .eq(SysUser::getType, type)
-                .list();
-        if (!mobileList.isEmpty()) {
-            throw new SystemException("手机号已经注册请更换手机号。");
-        }
-        // 身份证号
-        List<SysUser> identityList = lambdaQuery().eq(SysUser::getIdentity, sysUser.getIdentity())
-                .eq(SysUser::getType, type)
-                .list();
-        if (!identityList.isEmpty()) {
-            throw new SystemException("身份证号已经注册请更换身份证号。");
-        }
 
         //处理密码
         if (StringUtils.isNotEmpty(sysUser.getPassword())) {

src/main/java/com/ydtech/modules/partner/controller/PartnerUserController.java

@@ -12,6 +12,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 
 @Api(tags = "合伙人")
 @RestController
@@ -112,4 +114,26 @@ public class PartnerUserController extends BaseController {
     }
 
 
+    /**
+     * 查询当前用户的身份
+     * @param userId
+     * @return
+     */
+    @GetMapping("getUserGradeList")
+    public HttpResult getUserGradeList(@RequestParam(value = "userId",required = false) String userId) {
+        return HttpResult.ok(partnerUserService.getUserGradeList(userId));
+    }
+
+
+
+    /**
+     * 新增用户身份
+     * @param > map
+     * @return
+     */
+    @PostMapping("addUserIdentity")
+    public HttpResult addUserIdentity(@RequestBody Map<String,Object> map) {
+        return partnerUserService.addUserIdentity(map);
+    }
+
 }

src/main/java/com/ydtech/modules/partner/dao/PartnerUserMapper.java

@@ -118,4 +118,7 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     Integer selectNumber4(@Param("userId") String userId,@Param("number") String number,@Param("period") CommissionValidityPeriod period);
 
     List<PartnerUser> queryByUserId(String userId);
+
+    @Select("SELECT * FROM partner_user WHERE user_id = #{userId} ORDER BY grade DESC LIMIT 1")
+    PartnerUser selectMaxGradeUserId(String userId);
 }

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -7,6 +7,7 @@ import java.time.ZoneId;
 import java.util.*;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,9 +15,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.controller.SysUserController;
 import com.ydtech.modules.admin.dao.SysPartnerConfigMapper;
 import com.ydtech.modules.admin.dao.SysUserMapper;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.vo.AppUserInfoVo;
+import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.dao.EsmUserImageMapper;
 import com.ydtech.modules.esm.model.EsmUserImage;
@@ -278,6 +282,64 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         }
     }
 
+    @Override
+    public List<String> getUserGradeList(String userId) {
+        QueryWrapper<PartnerUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);
+        List<PartnerUser> partnerUsers = baseMapper.selectList(queryWrapper);
+        return partnerUsers.stream()
+                .map(user -> String.valueOf(user.getGrade()))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public HttpResult addUserIdentity(Map<String, Object> map) {
+        if (map.containsKey("userId")){
+            String userId = (String) map.get("userId");
+            PartnerUser partnerUsers = baseMapper.selectMaxGradeUserId(userId);
+            if (map.containsKey("gradeList")){
+                List<String> list =(ArrayList<String>)  map.get("gradeList");
+                List<String> gradeList = Arrays.stream((String[]) map.get("gradeList"))
+                        .sorted(Comparator.comparingInt(Integer::parseInt))
+                        .collect(Collectors.toList());
+                if (partnerUsers != null && CollectionUtil.isNotEmpty(gradeList)){
+                    SysUser sysUser = sysUserMapper.selectById(userId);
+                    for (String s : gradeList) {
+                        PartnerUser partnerUser = new PartnerUser();
+                        partnerUser.setName(sysUser.getName());
+                        partnerUser.setMobile(sysUser.getMobile());
+                        partnerUser.setUserId(sysUser.getId());
+                        partnerUser.setDeptId(sysUser.getDeptId());
+                        partnerUser.setDeptName(sysUser.getDeptName());
+                        partnerUser.setGrade(Integer.valueOf(s));
+                        partnerUser.setReferrerId(sysUser.getId());
+//                        if (StringUtils.equals("4",s)){
+//                            sysUser.setGrade(4);
+//                            SysUser2Vo sysUser2Vo = getUser2Vo(sysUser,partnerUser.getUserId());
+//                            SpringUtil.getBean(SysUserController.class).newSaveUserInfoByPartner(sysUser2Vo);
+//                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private static SysUser2Vo getUser2Vo(SysUser sysUser,String id) {
+        SysUser2Vo sysUser2Vo = new SysUser2Vo();
+        SysUser user = new SysUser();
+        user.setName(sysUser.getName());
+        user.setMobile(sysUser.getMobile());
+        user.setIdentity(sysUser.getIdentity());
+        user.setPassword(sysUser.getPassword());
+        user.setRoleId("21");
+        user.setReferrerId(id);
+        user.setDeptSource("2");
+        user.setGrade(4);
+        sysUser2Vo.setSysUser( user);
+        return sysUser2Vo;
+    }
+
     public static boolean containsOnlyId(List<String> list, String targetId) {
         return list != null
                 && !list.isEmpty()

src/main/java/com/ydtech/modules/partner/service/PartnerUserService.java

@@ -75,4 +75,7 @@ public interface PartnerUserService extends IService<PartnerUser> {
 
     void  getLevelUserId(String userId, Set<String> list);
 
+    List<String> getUserGradeList(String userId);
+
+    HttpResult addUserIdentity(Map<String, Object> map);
 }

src/main/java/com/ydtech/modules/ttqf/RetrieveTTQFApi.java

@@ -81,9 +81,13 @@ public class RetrieveTTQFApi {
                 throw new SystemException("商户余额不足，请联系管理员");
             }
             //用户已经签约  进行打款操作
-            return orderAdd(sysUser, withdrawal);
+            try {
+                return orderAdd(sysUser, withdrawal);
+            }catch (Exception e){
+                throw new SystemException(e.getMessage());
+            }
         } else {
-            return false;
+            throw new SystemException(resultModel.getBizMsg());
         }
     }
 

src/main/java/com/ydtech/modules/ttqf/xxx/VirtualWithdrawal.java

@@ -57,7 +57,6 @@ public class VirtualWithdrawal {
             if (CollectionUtil.isEmpty(redisList)) {
                 redisList = new ArrayList<>(0);
             }
-
             String virtualUserId = getVirtualUserId(amount, list, redisList);
             record.setVirtualUserId(virtualUserId);
 
@@ -66,6 +65,8 @@ public class VirtualWithdrawal {
                 LambdaQueryWrapper<SysUserBankCard> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(SysUserBankCard::getUserId, virtualUserId);
                 queryWrapper.eq(SysUserBankCard::getIsDefault, 1);
+                queryWrapper.orderByDesc(SysUserBankCard::getCreateTime);
+                queryWrapper.last("limit 1");
                 SysUserBankCard one = sysUserBankCardService.getOne(queryWrapper);
                 if (Objects.isNull(one)) {
                     record.setMessage("请先绑定银行卡");
@@ -86,7 +87,12 @@ public class VirtualWithdrawal {
                 withdrawal.setBankNumber(bankNumber);
                 HttpResult httpResult = ttqfService.userCashOut(withdrawal);
                 if (httpResult.getCode() == 200) {
-                    record.setIsStatus(1);
+                    String value = String.valueOf(httpResult.getData());
+                    if (StringUtils.equals("true", value)){
+                        record.setIsStatus(1);
+                    }else {
+                        record.setMessage("虚拟用户提现失败");
+                    }
                 } else {
                     record.setMessage(httpResult.getMsg());
                 }