Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev

es/entities/User.js

@@ -36,6 +36,7 @@ export const entityDesc = {
                 codes: '微信分享二维码',
                 isRoot: '是否超级用户',
                 addresses: '收货地址',
+                hasPassword: '用户是否存在密码',
                 accounts: '用户帐户',
                 withdrawAccounts: '用户提现帐户',
             },

es/oak-app-domain/User/Schema.d.ts

@@ -48,6 +48,7 @@ export type OpSchema = EntityShape & {
     idCardType?: ("ID-Card" | "passport" | "Mainland-passport") | null;
     idNumber?: String<32> | null;
     isRoot?: Boolean | null;
+    hasPassword?: Boolean | null;
     idState?: IdState | null;
     userState?: UserState | null;
 };
@@ -63,6 +64,7 @@ export type Schema = EntityShape & {
     idCardType?: ("ID-Card" | "passport" | "Mainland-passport") | null;
     idNumber?: String<32> | null;
     isRoot?: Boolean | null;
+    hasPassword?: Boolean | null;
     idState?: IdState | null;
     userState?: UserState | null;
     ref?: Schema | null;
@@ -153,6 +155,7 @@ type AttrFilter = {
     idCardType: Q_EnumValue<"ID-Card" | "passport" | "Mainland-passport">;
     idNumber: Q_StringValue;
     isRoot: Q_BooleanValue;
+    hasPassword: Q_BooleanValue;
     idState: Q_EnumValue<IdState>;
     userState: Q_EnumValue<UserState>;
     oper$operator: Oper.Filter & SubQueryPredicateMetadata;
@@ -209,6 +212,7 @@ export type Projection = {
     idCardType?: number;
     idNumber?: number;
     isRoot?: number;
+    hasPassword?: number;
     idState?: number;
     userState?: number;
     oper$operator?: Oper.Selection & {
@@ -450,6 +454,8 @@ export type SortAttr = {
     idNumber: number;
 } | {
     isRoot: number;
+} | {
+    hasPassword: number;
 } | {
     idState: number;
 } | {

es/oak-app-domain/User/Storage.js

@@ -43,6 +43,9 @@ export const desc = {
         isRoot: {
             type: "boolean"
         },
+        hasPassword: {
+            type: "boolean"
+        },
         idState: {
             type: "enum",
             enumeration: ["unverified", "verified", "verifying"]

es/oak-app-domain/User/locales/zh_CN.json

@@ -1 +1 @@
-{ "name": "用户", "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "指向用户", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码", "isRoot": "是否超级用户", "addresses": "收货地址", "accounts": "用户帐户", "withdrawAccounts": "用户提现帐户" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } }
+{ "name": "用户", "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "指向用户", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码", "isRoot": "是否超级用户", "addresses": "收货地址", "hasPassword": "用户是否存在密码", "accounts": "用户帐户", "withdrawAccounts": "用户提现帐户" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } }

lib/entities/User.js

@@ -39,6 +39,7 @@ exports.entityDesc = {
                 codes: '微信分享二维码',
                 isRoot: '是否超级用户',
                 addresses: '收货地址',
+                hasPassword: '用户是否存在密码',
                 accounts: '用户帐户',
                 withdrawAccounts: '用户提现帐户',
             },

lib/oak-app-domain/User/Schema.d.ts

@@ -48,6 +48,7 @@ export type OpSchema = EntityShape & {
     idCardType?: ("ID-Card" | "passport" | "Mainland-passport") | null;
     idNumber?: String<32> | null;
     isRoot?: Boolean | null;
+    hasPassword?: Boolean | null;
     idState?: IdState | null;
     userState?: UserState | null;
 };
@@ -63,6 +64,7 @@ export type Schema = EntityShape & {
     idCardType?: ("ID-Card" | "passport" | "Mainland-passport") | null;
     idNumber?: String<32> | null;
     isRoot?: Boolean | null;
+    hasPassword?: Boolean | null;
     idState?: IdState | null;
     userState?: UserState | null;
     ref?: Schema | null;
@@ -153,6 +155,7 @@ type AttrFilter = {
     idCardType: Q_EnumValue<"ID-Card" | "passport" | "Mainland-passport">;
     idNumber: Q_StringValue;
     isRoot: Q_BooleanValue;
+    hasPassword: Q_BooleanValue;
     idState: Q_EnumValue<IdState>;
     userState: Q_EnumValue<UserState>;
     oper$operator: Oper.Filter & SubQueryPredicateMetadata;
@@ -209,6 +212,7 @@ export type Projection = {
     idCardType?: number;
     idNumber?: number;
     isRoot?: number;
+    hasPassword?: number;
     idState?: number;
     userState?: number;
     oper$operator?: Oper.Selection & {
@@ -450,6 +454,8 @@ export type SortAttr = {
     idNumber: number;
 } | {
     isRoot: number;
+} | {
+    hasPassword: number;
 } | {
     idState: number;
 } | {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-pay-business",
-	"version": "2.4.1",
+	"version": "2.5.1",
 	"description": "",
 	"files": [
 		"lib/**/*",

src/entities/User.ts

@@ -57,6 +57,7 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
                 codes: '微信分享二维码',
                 isRoot: '是否超级用户',
                 addresses: '收货地址',
+                hasPassword: '用户是否存在密码',
                 accounts: '用户帐户',
                 withdrawAccounts: '用户提现帐户',
             },