no message

src/biz/member/homePage.ts

@@ -198,87 +198,6 @@ export async function getSheng ({userId}) {
 }
 
 
-/**
- * 会员缴费列表
- * @param userId 
- * @param state 
- * @returns dataList:[{data:列表, proofLetterInfo:证明函}]
- */
-export async function memberPayment({userId, state}) {
-    let selectParam:any = {userId};
-    if(state) selectParam.state = state;
-    let oldList = await find(TABLEENUM.订单表, selectParam, ["id", "userId", "unitName", "orderCycleStart", "orderCycleEnd", "money", "state"]);
-    if (!oldList || oldList.length<1) throw new BizError(ERRORENUM.目标数据不存在);
-    /**查询证明函需要字段会员等级 */
-    let myOldInfo = await findOnce(TABLEENUM.用户表, {userId:oldList.userId}, ["memberLevel"]);
-    if (!myOldInfo || !myOldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
-    //证明函返回数据配置
-    const proofLetterFiles = ["userId", "unitName", "orderCycleStart", "orderCycleEnd", "money"];
-
-    let dataList = [];
-    oldList.forEach( async info => {
-        /**处理列表返回数据字段 */
-        let item:any = extractData(info, ["id", "orderCycleStart", "orderCycleEnd", "money", "state"]);
-        item.state = changeEnumValue(ORDERSTATE, item.state);
-
-        /**处理证明函返回数据字段 */
-        let proofLetterInfo:any = extractData(info, proofLetterFiles);
-        proofLetterInfo.memberLevel = changeEnumValue(MEMBERLEVEL, myOldInfo.memberLevel);
-        proofLetterInfo.orderCycleStart = moment(proofLetterInfo.orderCycleStart).format("YYYY");
-        proofLetterInfo.orderCycleEnd = moment(proofLetterInfo.orderCycleEnd).format("YYYY");
-
-        dataList.push({list:item, proofLetterInfo});
-    })
-
-    return {dataList};
-}
-
-
-/**
- * 申请发票
- * @param id 会员缴费列表返回的id 
- */
-export async function applicationInvoice({id}) {
-    let oldInfo = await findOnce(TABLEENUM.订单表, {id, invoiceStatus:INVOICESTATUS.未开发票}, ["invoiceAdd"]);
-    if (!oldInfo || !oldInfo.invoiceAdd) throw new BizError(ERRORENUM.目标数据不存在);
-
-    let dataInfo = extractData(oldInfo, ["invoiceAdd"]);
-
-    return {dataInfo};
-}
-
-
-/**
- * 下载发票
- * @param id 会员缴费列表返回的id 
- */
-export async function downInvoice({id}) {
-    let oldInfo = await findOnce(TABLEENUM.订单表, {id, invoiceStatus:INVOICESTATUS.已开发票}, ["invoiceAdd"]);
-    if (!oldInfo || !oldInfo.invoiceAdd) throw new BizError(ERRORENUM.目标数据不存在);
-
-    let dataInfo = extractData(oldInfo, ["invoiceAdd"]);
-
-    return {dataInfo};
-}
-
-
-/**
- * 上传转账截图
- * @param param0 
- */
-export async function upTransferImg({id, weChartPR, offlinePaymentUrl}) {
-    let oldInfo = await findOnce(TABLEENUM.订单表, {id});
-    if (!oldInfo || !oldInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
-
-    await updateOneData(TABLEENUM.订单表, {id}, {weChartPR, offlinePaymentUrl});
-
-    return successResult();
-}
-
-
-
-
-
 
 
 

src/biz/member/member.ts

@@ -65,7 +65,7 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
 
 /**
  * 单位会员详情 
- * @param userId 
+ * @param id 会员列表返回的userId 
  * @returns {顶部数据, 基本信息, 单位信息, 单位所获得科研成果}
  */
 
@@ -95,7 +95,7 @@ export async function unitMemberDetails({id}) {
  * 单位会员 修改
  * @param form 修改信息表单
  * @param keyanForm 修改科研信息表单
- * @param userId 
+ * @param id 会员列表返回的userId  
  * @returns 
  */
 export async function unitMemberUpdate({form, keyanForm, id}) {
@@ -129,7 +129,7 @@ export async function unitMemberUpdate({form, keyanForm, id}) {
 
 /**
  * 删除单位所获得科研成果
- * @param param0 
+ * @param id 科研成果返回的id 
  * @returns 
  */
 export async function delResearch({id}) {
@@ -183,7 +183,7 @@ export async function individualMemberList({name, documentId, phone, individualM
 
 /**
  * 个人会员详情
- * @param param0 
+ * @param id 会员列表返回的userId  
  * @returns {顶部数据, 基本信息, 专业信息, 其他附件}
  */
 
@@ -212,7 +212,7 @@ export async function individualMemberDetails({id}) {
 
 /**
  * 个人会员 修改
- * @param userId
+ * @param id 会员列表返回的userId 
  * @param form
  * @returns 
  */

src/biz/member/memberFees.ts

@@ -60,11 +60,11 @@ export async function getPaid({unitName, joinStartTime, joinEndTime, memberType,
 
 /**
  * 已缴费列表中的订单日志 success
- * @param param0 
+ * @param id 会员列表返回的userId  
  */
-export async function paidOrderList({userId}) {
+export async function paidOrderList({id}) {
     
-    let dbList = await findToSort(TABLEENUM.订单表, {userId}, {payTime:-1}, ["orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "state"]);
+    let dbList = await findToSort(TABLEENUM.订单表, {userId:id}, {payTime:-1}, ["orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "state"]);
 
     let dataList = [];
     dbList.forEach(info => {
@@ -291,7 +291,7 @@ export async function getGracePeriod({unitName, joinTime, memberType, pageNumber
 
 /**
  * 移除宽限期
- * @param param0 
+ * @param id 宽限期列表返回的userId  
  * @returns 
  */
 export async function delGracePeriod({id}) {

src/biz/member/order.ts

@@ -2,7 +2,7 @@
  * 订单相关 success
  */
 import moment = require("moment");
-import { COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
+import { AUDITINGCLIENT, COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
 import { generateOrderId, successResult } from "../../tools/system";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 import { addOneData } from "../../data/add";
@@ -320,18 +320,38 @@ export async function orderList({userId, type}) {
     if (type == ORDERSTATE.已支付) findParam.state = ORDERSTATE.已支付;
     else if (type == ORDERSTATE.未支付) findParam.state = ORDERSTATE.未支付;
 
-    const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id"];
+    const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id", "advanceInvoice", "invoiceStatus"];
     let dbList = await find(TABLEENUM.订单表, findParam, SelectFile);
+    /**查询证明函需要字段会员等级 */
+    let myOldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["memberLevel"]);
+    if (!myOldInfo || !myOldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    //证明函返回数据配置
+    const proofLetterFiles = ["unitName", "orderCycleStart", "orderCycleEnd", "money"];
 
     let dataList = [];
     dbList.forEach(info => {
         let {orderCycleStart, orderCycleEnd, money, state, id} = info;
         let moneyStr = state == ORDERSTATE.已支付 ? "已缴金额" : "待缴金额"; 
-        dataList.push({
+
+        let invoiceStr = "";
+        if (info.invoiceStatus == INVOICESTATUS.已开发票) invoiceStr = "下载发票";
+        if (info.invoiceStatus != INVOICESTATUS.已开发票 && info.advanceInvoice) invoiceStr = "申请进度";
+        if (info.invoiceStatus != INVOICESTATUS.已开发票 && !info.advanceInvoice) invoiceStr = "申请发票";
+
+        let item = {
             cycle:`${moment(orderCycleStart).format("YYYY-MM-DD")}至${moment(orderCycleEnd).format("YYYY-MM-DD")}`,
             money:`${moneyStr}:${money}`,
-            id
-        });
+            id,
+            invoiceStatus:invoiceStr
+        };
+
+        /**处理证明函返回数据字段 */
+        let proofLetterInfo:any = extractData(info, proofLetterFiles);
+        proofLetterInfo.memberLevel = changeEnumValue(MEMBERLEVEL, myOldInfo.memberLevel);
+        proofLetterInfo.orderCycleStart = moment(proofLetterInfo.orderCycleStart).format("YYYY");
+        proofLetterInfo.orderCycleEnd = moment(proofLetterInfo.orderCycleEnd).format("YYYY");
+
+        dataList.push({list:item, proofLetterInfo});
     });
 
     return {dataList}
@@ -340,14 +360,17 @@ export async function orderList({userId, type}) {
 
 /**
  * 个人页申请开发票(提前开票)
+ * @param id 会员缴费列表返回的id 
+ * @param newUscc 社会信用代码 
+ * @param newUnitName 发票抬头 
  */
-export async function applicationInvoice({id}) {
+export async function applicationInvoice({id, newUscc, newUnitName}) {
     let orderInfo = await find(TABLEENUM.订单表, {id}, ["id", "invoiceStatus", "advanceInvoice", "invoiceAdd", "state", "advanceInvoice"]);
     if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
     if (orderInfo.invoiceStatus == INVOICESTATUS.已开发票) throw new BizError(ERRORENUM.发票已开具不可重复提交);
     if (orderInfo.invoiceStatus == INVOICESTATUS.退回) throw new BizError(ERRORENUM.请求已被退回请重新申请);
 
-    let updateInfo:any = {invoiceStatus:INVOICESTATUS.未开发票};
+    let updateInfo:any = {invoiceStatus:INVOICESTATUS.未开发票, newUscc, newUnitName};
     if (orderInfo.state != ORDERSTATE.已支付) updateInfo.advanceInvoice = true;
 
     await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
@@ -358,6 +381,7 @@ export async function applicationInvoice({id}) {
 
 /**
  * 重新申请发票
+ * @param id 会员缴费列表返回的id 
  */
 export async function reapplyInvoice({id}) {
     let orderInfo = await find(TABLEENUM.订单表, {id}, ["id", "invoiceStatus", "advanceInvoice", "invoiceAdd", "state", "advanceInvoice"]);
@@ -370,4 +394,55 @@ export async function reapplyInvoice({id}) {
     await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
     
     return successResult();
-}
\ No newline at end of file
+}
+
+
+/**
+ * 下载发票
+ * @param id 会员缴费列表返回的id 
+ */
+export async function downInvoice({id}) {
+    let oldInfo = await findOnce(TABLEENUM.订单表, {id, invoiceStatus:INVOICESTATUS.已开发票}, ["invoiceAdd"]);
+    if (!oldInfo || !oldInfo.invoiceAdd) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let dataInfo = extractData(oldInfo, ["invoiceAdd"]);
+
+    return {dataInfo};
+}
+
+
+/**
+ * 发票后台审批进度
+ * @param id 会员缴费列表返回的id 
+ */
+export async function getInvoiceStatus({id}) {
+    let oldInfo = await findOnce(TABLEENUM.订单表, {id}, ["invoiceStatus"]);
+    if (!oldInfo || !oldInfo.invoiceAdd) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let dataInfo = {state:AUDITINGCLIENT.已申请};
+    if (oldInfo.invoiceStatus == INVOICESTATUS.已开发票) dataInfo.state = AUDITINGCLIENT.审核通过;
+    if (oldInfo.invoiceStatus != INVOICESTATUS.未开发票) dataInfo.state = AUDITINGCLIENT.后台审批中;
+    if (oldInfo.invoiceStatus != INVOICESTATUS.退回) dataInfo.state = AUDITINGCLIENT.审核失败;
+
+    return {dataInfo};
+}
+
+
+/**
+ * 上传转账截图
+ * @param param0 
+ */
+ export async function upTransferImg({id, weChartPR, offlinePaymentUrl}) {
+    let oldInfo = await findOnce(TABLEENUM.订单表, {id});
+    if (!oldInfo || !oldInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
+
+    await updateOneData(TABLEENUM.订单表, {id}, {weChartPR, offlinePaymentUrl});
+
+    return successResult();
+}
+
+
+
+
+
+

src/config/enum.ts

@@ -425,6 +425,7 @@ export enum INVOICESTATUSCLIENT{
  * 审核状态 前端用
  */
 export enum AUDITINGCLIENT {
+    已申请 = 0,
     审核通过 = 2,
     后台审批中 = 3,
     审核失败 = 4

src/routers/member/router.ts

@@ -644,32 +644,6 @@ export const Config = {
             ],
             bindBiz:homePageBiz.getSheng
         },
-        {
-            apiName:"会员缴费列表",
-            subUrl:'/homepage/memberpayment',
-            param:[
-                {key:"userId", type:"String", desc:"用户id"},
-                {key:"state", type:"Number", desc:"缴费状态", isNull:true}
-            ],
-            bindBiz:homePageBiz.memberPayment
-        },
-        {
-            apiName:"申请发票",
-            subUrl:'/homepage/applicationinvoice',
-            param:[
-                {key:"id", type:"String", desc:"缴费列表返回id"}
-            ],
-            bindBiz:homePageBiz.applicationInvoice
-        },
-        {
-            apiName:"下载发票",
-            subUrl:'/homepage/downinvoice',
-            param:[
-                {key:"id", type:"String", desc:"缴费列表返回id"}
-            ],
-            bindBiz:homePageBiz.downInvoice
-        },
-
     ]
 }
 

src/routers/order/router.ts

@@ -76,6 +76,49 @@ export const Config = {
             ],
             bindBiz:orderBiz.orderList
         },
+        {
+            apiName:"会员缴费列表",
+            subUrl:'/order/memberpayment',
+            param:[
+                {key:"userId", type:"String", desc:"用户id"},
+                {key:"type", type:"Number", desc:"缴费状态", isNull:true}
+            ],
+            bindBiz:orderBiz.orderList
+        },
+        {
+            apiName:"申请发票",
+            subUrl:'/order/applicationinvoice',
+            param:[
+                {key:"id", type:"String", desc:"会员缴费列表返回id"}
+            ],
+            bindBiz:orderBiz.applicationInvoice
+        },
+        {
+            apiName:"重新申请发票",
+            subUrl:'/order/applicationinvoice',
+            param:[
+                {key:"id", type:"String", desc:"会员缴费列表返回id"}
+            ],
+            bindBiz:orderBiz.reapplyInvoice
+        },
+        {
+            apiName:"下载发票",
+            subUrl:'/order/downinvoice',
+            param:[
+                {key:"id", type:"String", desc:"会员缴费列表返回id"}
+            ],
+            bindBiz:orderBiz.downInvoice
+        },
+        {
+            apiName:"上传转账截图",
+            subUrl:'/order/uptransferimg',
+            param:[
+                {key:"id", type:"String", desc:"会员缴费列表返回id"},
+                {key:"weChartPR", type:"String", desc:"转账单号"},
+                {key:"offlinePaymentUrl", type:"String", desc:"截图上传"},
+            ],
+            bindBiz:orderBiz.upTransferImg
+        },
     ],
     
 }