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

src/biz/member/order.ts

@@ -355,9 +355,9 @@ export async function invoicedList({unitName, paymentType, isPay, pageNumber}) {
         itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
         itemData.paymentMethod = changeEnumValue(MEMBERTYPE, itemData.paymentMethod);
         itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
-        itemData.state = changeEnumValue(ORDERSTATE, itemData.state);
+        itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
         let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState"])
-        itemData.memberState = userInfo.memberState;
+        itemData.memberState = changeEnumValue(MEMBERSTATE, userInfo.memberState);
         dataList.push(itemData);
     }
 
@@ -380,6 +380,20 @@ export async function transferScreenshot({id}) {
 }
 
 
+/**
+ * 转账截图、转账单号弹窗
+ * @param id 订单id
+ * @returns 
+ */
+ export async function invoicePop({id}) {
+    let oldInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "invoiceAdd"]);
+    if (!oldInfo || !oldInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let dataInfo = extractData(oldInfo, ["id", "invoiceAdd"]);
+
+    return {dataInfo};
+}
+
 
 
 

src/routers/order/router.ts

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