no message

src/biz/member/homePage.ts

@@ -20,7 +20,8 @@ import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 /**
  * 会员信息展示
  * @param userId 登录的用户id
- * @returns {头部数据， 基本信息， 专业信息}
+ * @returns 个人会员：{头部数据， 基本信息， 专业信息， 其他附件}
+ * @returns 专业会员：{头部数据， 基本信息， 单位信息， 单位所获得科研成果}
  */
 export async function getMemberData({userId}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
@@ -29,22 +30,38 @@ export async function getMemberData({userId}) {
     let topSelectFiles = ["loginId", "memberType", "userRegisterState", "integral", "joinTime", "lifespanStartTime", "lifespanEndTime", "memberLevel"];
     let baseSelectFiles = [];
     let majorSelectFiles = [];
+    let otherAttachmentFiles = [];
     /**判断会员类型，个人会员与单位会员返回不同字段 */
     if (oldInfo.memberType == MEMBERTYPE.单位会员) {
-        baseSelectFiles = ["unitName", "uscc", "sheng", "shi", "qu", "nation", "birth", "addres", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", "contactPersonDuties", 
-        "contactPersonPhone", "uusinessLicenseUrl"];
-        majorSelectFiles = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", 
-        "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", 
-        "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua"];
+        baseSelectFiles = ["userId", "unitName", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", 
+        "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "addres", "sheng", "shi", "qu"];
+        majorSelectFiles = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", 
+        "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", 
+        "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"];
+        /**获取单位科研成果数据 */
+        let oldKeYanList = await find(TABLEENUM.单位所获得科研成果表, {userId}, ["id", "startTime", "endTime", "describe"]);
+        let otherAttachmentFiles = [];
+        oldKeYanList.forEach(info => {
+            otherAttachmentFiles.push({
+                id:info.id,
+                startTime: moment(info.startTime).format("YYYY-MM-DD"),
+                endTime: moment(info.endTime).format("YYYY-MM-DD"),
+                describe:info.describe
+            });
+        })
+
     } else {
-        baseSelectFiles = ["name", "sex", "documentType", "documentId", "sheng", "shi", "qu", "nation", "birth", "addres", "education", "phone", "mail", "photoUrl", "uscc", "unitName"];
-        majorSelectFiles = ["workUnit", "unitName", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory"]; 
+        baseSelectFiles = ["userId", "name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "phone", "mail", 
+        "addres", "photoUrl", "education", "uscc", "unitName"];
+        majorSelectFiles = ["unitName", "duties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"]; 
+        otherAttachmentFiles = ["cardUrl", "academicCERTUrl", "professionalCERTUrl", "auxiliaryMaterial"];
     }
 
     /**返回指定配置字段 */
     let topInfo:any = extractData(oldInfo, topSelectFiles);
     let baseInfo:any = extractData(oldInfo, baseSelectFiles);
     let majorInfo:any = extractData(oldInfo, majorSelectFiles);
+    let otherAttachment:any = extractData(oldInfo, otherAttachmentFiles);
 
     /**处理枚举值 */
     topInfo.integral = 0;
@@ -60,7 +77,7 @@ export async function getMemberData({userId}) {
     // if(majorInfo.unitMemberType) majorInfo.unitMemberType = changeEnumValue(UNITMEMBERTYPE, majorInfo.unitMemberType);
     // if(majorInfo.yuanXiaoBanXueLeiXing) majorInfo.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, majorInfo.yuanXiaoBanXueLeiXing);
 
-    return {topInfo, baseInfo, majorInfo};
+    return {topInfo, baseInfo, majorInfo, otherAttachment};
 }
 
 

src/biz/member/member.ts

@@ -67,13 +67,18 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
  * 单位会员详情 
  * @param id 会员列表返回的userId 
  * @returns {顶部数据, 基本信息, 单位信息, 单位所获得科研成果}
+ * 基本信息: "unitName"：单位名称、原社会信用代码, "uscc"：单位信用代码、原发票抬头, "legalPerson"：法人代表, "legalPersonPhone"：法人代表联系电话, "legalPersonMail"：法人邮箱, "unitMail"：单位电子邮箱, "contactPerson"：日常联系人, "contactPersonDuties"：日常联系人职务, "contactPersonPhone"：日常联系人电话, "uusinessLicenseUrl"：营业执照图片地址, "addres"：通信地址, "sheng"：省, "shi"：市, "qu"：区, "newUscc"：新社会信用代码, "newUnitName"：新发票抬头
+ * 单位信息: "unitMemberType"：单位类型, "yuanXiaoBanXueLeiXing"：办学类型, "yuanXiaoZhuGuanBuMen"：主管部门, "yuanXiaoFuZeRen"：主要负责人姓名, "yuanXiaoFuZeRenZhiWu"：主要负责人职位, "yuanXiaoFuZeRenDianHua"：主要负责人电话, 
+"yuanXiaoBanGongFuZeRen"：办公负责人姓名, "yuanXiaoBanGongFuZeRenDianHua"：办公负责人电话, "ZhuYaoFuZeRenYouXiang"：主要负责人邮箱, "yuanXiaoKeYanFuZeRen"：科研负责人姓名, "yuanXiaoKeYanFuZeRenDianHua"：看科研负责人电话,
+"jiaoXueFuZeRenXinMing"：教学负责人姓名, "jiaoXueFuZeRenDianHua"：教学负责人电话
+ * 单位所获得科研成果: "id", "startTime"：开始时间, "endTime"：结束时间, "describe"：描述
  */
 
-const UnitBasicConfig = ["userId", "unitName", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", 
-"uusinessLicenseUrl", "addres", "sheng", "shi", "qu", "uscc", "unitName"];
+const UnitBasicConfig = ["userId", "unitName", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", 
+"uusinessLicenseUrl", "addres", "sheng", "shi", "qu"];
 const UnitConfig = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", 
 "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua",
-"jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua"];
+"jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"];
 
 export async function unitMemberDetails({id}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
@@ -84,13 +89,25 @@ export async function unitMemberDetails({id}) {
     let basicInfo:any = extractData(oldInfo, UnitBasicConfig);
     /**获取订单表新社会信用代码和新发票抬头 */
     let orderInfo = await findOnce(TABLEENUM.订单表, {userId:id});
-    if (!orderInfo || !orderInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
-    basicInfo.newUscc = orderInfo.newUscc;
-    basicInfo.newUnitName = orderInfo.newUnitName;
+    if (!orderInfo || !orderInfo.userId) {
+        basicInfo.newUscc = "-";
+        basicInfo.newUnitName = "-";
+    } else {
+        basicInfo.newUscc = orderInfo.newUscc;
+        basicInfo.newUnitName = orderInfo.newUnitName;
+    }
     let unitInfo = extractData(oldInfo, UnitConfig);
     
-    let oldKeYanInfo = await findOnce(TABLEENUM.单位所获得科研成果表, {userId:id});
-    let scientificResearch = extractData(oldKeYanInfo, ["id", "startTime", "endTime", "describe"]);
+    let oldKeYanList = await find(TABLEENUM.单位所获得科研成果表, {userId:id}, ["id", "startTime", "endTime", "describe"]);
+    let scientificResearch = [];
+    oldKeYanList.forEach(info => {
+        scientificResearch.push({
+            id:info.id,
+            startTime: moment(info.startTime).format("YYYY-MM-DD"),
+            endTime: moment(info.endTime).format("YYYY-MM-DD"),
+            describe:info.describe
+        });
+    })
     
     return {topInfo, basicInfo, unitInfo, scientificResearch};
 }
@@ -188,11 +205,13 @@ export async function individualMemberList({name, documentId, phone, individualM
  * 个人会员详情
  * @param id 会员列表返回的userId  
  * @returns {顶部数据, 基本信息, 专业信息, 其他附件}
+ * 基本信息: "name"：真实姓名, "sex"：性别, "nation"：民族, "birth"：出身年月, "documentType"：证件类型, "documentId"：证件号码, "sheng"：省, "shi"：市, "qu"：区, "phone"：手机号码,"mail"：电子邮箱,"addres"：通信地址, "photoUrl"：蓝底证件照, "education"：学历, "uscc"：原社会信用代码, "unitName"：原发票抬头, "newUscc"：新社会信用代码, "newUnitName"：新发票抬头
+ * 专业信息: "unitName"：工作单位, "duties"：职务, "workTitle"：职称, "profCategory"：专业类别, "studyResume"：学习简历, "workResume"：工作简历, "profAchievement"：科研成果, "otherEMP"：其他组织任职情况, "otherPROF"：其他情况
+ * 其他附件: "cardUrl"：身份证正反面图片地址, "academicCERTUrl"：学历证明图片地址, "professionalCERTUrl"：工作证明图片地址, "auxiliaryMaterial"：其他辅助材料
  */
 
-const IndividualBasicConfig = ["name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "addres", "photoUrl", "uscc", 
-"unitName", "education", "uscc", "unitName"];
-const SpecialityConfig = ["workUnit", "duties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
+const IndividualBasicConfig = ["userId", "name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "phone", "mail", "addres", "photoUrl", "education", "uscc", "unitName"];
+const SpecialityConfig = ["unitName", "duties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
 
 export async function individualMemberDetails({id}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
@@ -206,9 +225,13 @@ export async function individualMemberDetails({id}) {
     basicInfo.nation = changeEnumValue(NATION, basicInfo.nation);
     /**获取订单表新社会信用代码和新发票抬头 */
     let orderInfo = await findOnce(TABLEENUM.订单表, {userId:id});
-    if (!orderInfo || !orderInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
-    basicInfo.newUscc = orderInfo.newUscc;
-    basicInfo.newUnitName = orderInfo.newUnitName;
+    if (!orderInfo || !orderInfo.userId) {
+        basicInfo.newUscc = "-";
+        basicInfo.newUnitName = "-";
+    } else {
+        basicInfo.newUscc = orderInfo.newUscc;
+        basicInfo.newUnitName = orderInfo.newUnitName;
+    }
 
     let specialityInfo:any = extractData(oldInfo, SpecialityConfig);
     basicInfo.profCategory = changeEnumValue(PROFCATEGORY, basicInfo.profCategory);

src/biz/member/order.ts

@@ -184,7 +184,7 @@ export async function paidList({unitName, paymentType, costType, pageNumber }) {
 
     let dataList = [];
 
-    let itemFile = ["userId", "unitName", "money", "paymentNum"];
+    let itemFile = ["id", "unitName", "money", "paymentNum"];
     dbList.forEach(info =>  {
         let itemData:any = extractData(info, itemFile);
         itemData.memberState = changeEnumValue(MEMBERSTATE, info.memberState);
@@ -265,7 +265,7 @@ export async function billStateList({unitName, paymentType, isPay, pageNumber})
 
     let dataList = [];
 
-    let itemFile = ["unitName", "money", "paymentNum"];
+    let itemFile = ["userId", "unitName", "money", "paymentNum"];
     dbList.forEach(info =>  {
         let itemData:any = extractData(info, itemFile);
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
@@ -358,6 +358,31 @@ export async function invoicedList({unitName, paymentType, isPay, pageNumber}) {
 
 
 /**
+ * 转账截图、转账单号弹窗
+ * @param id 订单id
+ * @returns 
+ */
+export async function transferScreenshot({id}) {
+    let oldInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "offlinePaymentUrl", "paymentNum"]);
+    if (!oldInfo || !oldInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let dataInfo = extractData(oldInfo, ["id", "offlinePaymentUrl", "paymentNum"]);
+
+    return {dataInfo};
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/**
  * 个人页待订单列表  success
  * @param param0 
  */
@@ -512,12 +537,6 @@ export async function getInvoiceStatus({id}) {
 
 
 
-export async function 
-
-
-
-
-
 
 
 

src/routers/order/router.ts

@@ -103,6 +103,14 @@ export const Config = {
             ],
             bindBiz:orderBiz.invoicedList
         },
+        {
+            apiName:"转账单号弹窗",
+            subUrl:'/order/transferscreenshot',
+            param:[
+                {key:"id", type:"String", desc:"订单id"},
+            ],
+            bindBiz:orderBiz.transferScreenshot
+        },
     ],
     "会员个人页":[
         {

src/routers/public/router.ts

@@ -199,5 +199,12 @@ export const Config = {
             defaultParam:enumConfig.STATE,
             bindBiz:publicBiz.setEnumInterface
         },
+        {
+            apiName:"会员状态",
+            subUrl:'/memberstate', 
+            param:[],
+            defaultParam:enumConfig.MEMBERSTATE,
+            bindBiz:publicBiz.setEnumInterface
+        },
     ],
 }