提现bug修改

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

@@ -294,35 +294,47 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @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());
+        try {
+            if (map.containsKey("userId")){
+                String userId = (String) map.get("userId");
+                PartnerUser partnerUsers = baseMapper.selectMaxGradeUserId(userId);
+                if (partnerUsers == null){
+                    return HttpResult.error("请选择用户");
+                }
+                if (StringUtils.equals("4",String.valueOf(partnerUsers.getGrade()))){
+                    return HttpResult.error("请邀请团队长");
+                }
+                if (map.containsKey("gradeList")){
+                    List<String> list = (ArrayList<String>)  map.get("gradeList");
+                    List<String> gradeList = list.stream()
+                            .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(partnerUsers.getUserId());
+                            baseMapper.insert(partnerUser);
 //                        if (StringUtils.equals("4",s)){
 //                            sysUser.setGrade(4);
 //                            SysUser2Vo sysUser2Vo = getUser2Vo(sysUser,partnerUser.getUserId());
 //                            SpringUtil.getBean(SysUserController.class).newSaveUserInfoByPartner(sysUser2Vo);
 //                        }
+                        }
                     }
                 }
             }
+        }catch (Exception e){
+            log.error("添加失败",e);
+            return HttpResult.error();
         }
-        return null;
+        return HttpResult.ok("添加成功");
     }
 
     private static SysUser2Vo getUser2Vo(SysUser sysUser,String id) {

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

@@ -118,7 +118,7 @@ public class RetrieveTTQFApi {
                 .wechatAppId("")
                 .notifyUrl(PayConstantStatus.getPaymentNoticeUrl())
                 .build();
-        OrderAddResponse response = testOrderAdd(addModel, sysUser.getId());
+        OrderAddResponse response = testOrderAdd(addModel, sysUser.getId(),withdrawal.getVirtualUserId());
         if (response.isSuccess()) {
             log.info("成功 ====>orderAdd {}", response.getResultModel());
         } else {
@@ -293,18 +293,19 @@ public class RetrieveTTQFApi {
     /**
      * 打款订单新增接口
      */
-    public static OrderAddResponse testOrderAdd(OrderAddModel addModel, String userId) {
+    public static OrderAddResponse testOrderAdd(OrderAddModel addModel, String userId,String sysAmountAuditingId) {
         OrderAddRequest addRequest = OrderAddRequest.builder()
                 .requestId(System.currentTimeMillis() + "")
                 .bizModel(addModel)
                 .build();
         OrderAddResponse response = tangClient.execute(addRequest);
         boolean confirm = false;
-        String sysAmountAuditingId = "";
-        if (response.isSuccess()) {
-            confirm = confirm(response.getResultModel().getOrderNo(), response.getResultModel().getBatchNo());
-            sysAmountAuditingId = SpringUtil.getBean(AmountAuditingService.class).sendMessage(response.getResultModel().getAmount(), userId, addModel.getUserBankCardNo());
-        }
+        //线上提现
+//        String sysAmountAuditingId = "";
+//        if (response.isSuccess()) {
+//            confirm = confirm(response.getResultModel().getOrderNo(), response.getResultModel().getBatchNo());
+//            sysAmountAuditingId = SpringUtil.getBean(AmountAuditingService.class).sendMessage(response.getResultModel().getAmount(), userId, addModel.getUserBankCardNo());
+//        }
         savePayOrder.savePayOrder(addRequest.getApiUrl(), response, JSONObject.toJSONString(addModel), JSONObject.toJSONString(response), userId, confirm, sysAmountAuditingId);
         return response;
     }

src/main/java/com/ydtech/modules/ttqf/entity/vo/UserWithdrawal.java

@@ -13,6 +13,8 @@ public class UserWithdrawal {
 
     private String userId;
 
+    private String virtualUserId;
+
     private BigDecimal amount;
 
     private String remarks;

src/main/java/com/ydtech/modules/ttqf/service/impl/TtqfServiceImpl.java

@@ -143,6 +143,7 @@ public class TtqfServiceImpl implements TtqfService {
             if (null != noticeEntity){
                 LambdaQueryWrapper<PaymentNoticeEntity> paymentNoticeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 paymentNoticeEntityLambdaQueryWrapper.eq(PaymentNoticeEntity::getMchOrderNo, noticeEntity.getMchOrderNo());
+                paymentNoticeEntityLambdaQueryWrapper.last("limit 1");
                 PaymentNoticeEntity notice = noticeMapper.selectOne(paymentNoticeEntityLambdaQueryWrapper);
                 if (null == notice){
                     noticeEntity.setCreateTime(new Date());
@@ -152,10 +153,9 @@ public class TtqfServiceImpl implements TtqfService {
             LambdaQueryWrapper<PayTtqfLog> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayTtqfLog::getMchOrderNo, noticeEntity.getMchOrderNo());
             PayTtqfLog ttqfLog = logMapper.selectOne(wrapper);
-            SysAmountAuditingVo amountAuditingVo = new SysAmountAuditingVo();
-            amountAuditingVo.setAmount(noticeEntity.getAmount());
-            amountAuditingVo.setUserId(ttqfLog.getUserId());
-            pushLg(ttqfLog);
+            if (!Objects.isNull(ttqfLog)){
+                pushLg(ttqfLog);
+            }
             //writeRecord(amountAuditingVo,ttqfLog.getSysAmountAuditingId(),noticeEntity.getFeeAmount());
         }
         log.info("接收打款通知回调 + paymentNotice ================={}", parse);

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

@@ -83,6 +83,7 @@ public class VirtualWithdrawal {
             if (StringUtils.isNotEmpty(virtualUserId) && StringUtils.isNotEmpty(bankNumber)) {
                 UserWithdrawal withdrawal = new UserWithdrawal();
                 withdrawal.setUserId(virtualUserId);
+                withdrawal.setVirtualUserId(userId);
                 withdrawal.setAmount(amount);
                 withdrawal.setBankNumber(bankNumber);
                 HttpResult httpResult = ttqfService.userCashOut(withdrawal);