0元支付加入订单编号返回

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -478,6 +478,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             result.put("payMap", payMap);
         }
         result.put("amount", productInfo.getPayAmount());
+        result.put("orderNo", orderNo);
         createOrderRecord(tenantId, productInfo.getPayAmount(), orderNo, tenantEnum, orderState, WrapperUtil.toStr(result, "routingMerNos"));
         log.info("tenant pay >>>>> {} ", result);
         return result;
@@ -527,6 +528,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             orderState = 1;
         }
         result.put("amount", amount);
+        result.put("orderNo", orderNo);
         createOrderRecord(tenantId, amount, orderNo, tenantEnum, orderState, WrapperUtil.toStr(result, "routingMerNos"));
         log.info("tenant pay >>>>> {} ", result);
         return result;
@@ -638,10 +640,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                 .map(sysUserFeignService::queryUserByMobile)
                 .orElse(null);
         if (Objects.nonNull(sysUser)) {
-            if (sysUser.getUserType().contains(SysUserType.SYSTEM.getCode())) {
-                bucket.delete();
-                throw new BizException("该手机号已被注册!");
-            }
+            bucket.delete();
+            throw new BizException("该手机号已被注册!");
         }
         return bucket;
     }
@@ -735,6 +735,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             orderState = 1;
         }
         result.put("amount", amount);
+        result.put("orderNo", orderNo);
         createOrderRecord(tenantId, amount, orderNo, tenantEnum, orderState, WrapperUtil.toStr(result, "routingMerNos"));
         log.info("tenant pay >>>>> {} ", result);
         return result;