Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

src/biz/member/finance/costVerification.ts

@@ -311,29 +311,34 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
-            
-            if (key == "memberCategory") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
-            }
-            if (key == "name") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
-            }
-            if (key == "card") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
-            }
-            if (key == "mail") {
-                value = userInfo.mail;
+            if (userInfo) {
+                if (key == "memberCategory") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
+                }
+                if (key == "name") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
+                }
+                if (key == "card") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
+                }
+                if (key == "mail") {
+                    value = userInfo.mail;
+                }
+                
+                if (key == "phone") {
+                    value = userInfo.phone;
+                }
+                if (key == "memberLevel") {
+                    value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
+                }
+                if (key == "session") {
+                    value = getEdition(Math.floor(userInfo.session/100), userInfo.session%100 );
+                }
             }
             
-            if (key == "phone") {
-                value = userInfo.phone;
-            }
-            if (key == "memberLevel") {
-                value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
-            }
             if (key == "operationTime") {
                 if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD");
                 else value = "-"
@@ -343,9 +348,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
                     value = "-";
                 }
             }
-            if (key == "session") {
-                value = getEdition(Math.floor(userInfo.session/100), userInfo.session%100 );
-            }
+            
             if (key == "confirmReceipt") {
                 value = value == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批";
             }

src/biz/member/finance/invoice.ts

@@ -354,28 +354,30 @@ export async function backInvoice({id}) {
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
-            
-            if (key == "memberCategory") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
-            }
-            if (key == "name") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
-            }
-            if (key == "card") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
-            }
-            if (key == "mail") {
-                value = userInfo.mail;
-            }
-            if (key == "phone") {
-                value = userInfo.phone;
-            }
-            if (key == "memberLevel") {
-                value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
+            if (userInfo) {
+                if (key == "memberCategory") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
+                }
+                if (key == "name") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
+                }
+                if (key == "card") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
+                }
+                if (key == "mail") {
+                    value = userInfo.mail;
+                }
+                if (key == "phone") {
+                    value = userInfo.phone;
+                }
+                if (key == "memberLevel") {
+                    value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
+                }
             }
+            
             if (key == "operationTime") {
                 if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD");
                 else value = "-"
@@ -613,23 +615,26 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
-            if (key == "name") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
-            }
-            if (key == "card") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
-            }
-            if (key == "mail") {
-                value = userInfo.mail;
-            }
-            if (key == "phone") {
-                value = userInfo.phone;
-            }
-            if (key == "memberLevel") {
-                value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
+            if (userInfo) {
+                if (key == "name") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
+                }
+                if (key == "card") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.documentId;
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.uscc;
+                }
+                if (key == "mail") {
+                    value = userInfo.mail;
+                }
+                if (key == "phone") {
+                    value = userInfo.phone;
+                }
+                if (key == "memberLevel") {
+                    value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
+                }
             }
+            
             if (key == "operationTime") {
                 if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD");
                 else value = "-"

src/biz/member/order.ts

@@ -724,16 +724,19 @@ export async function refundApprove({id, refundImgUrl}) {
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
-            if (key == "name") {
-                if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
-                else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
-            }
-            if (key == "phone") {
-                value = userInfo.phone;
-            }
-            if (key == "memberLevel") {
-                value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
+            if (userInfo) {
+                if (key == "name") {
+                    if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
+                    else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
+                }
+                if (key == "phone") {
+                    value = userInfo.phone;
+                }
+                if (key == "memberLevel") {
+                    value = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
+                }
             }
+            
             if (key == "state") {
                 if (!info.isReplenishReturnInfo) value = "资料补充中";
                 else {