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

src/biz/member/memberFees.ts

@@ -118,6 +118,7 @@ export async function unpaidList({unitName, joinStartTime, joinEndTime, memberTy
     dbList.forEach(info => {
         let item:any = extractData(info, itemFiles);
         item.lifespanTime = `${moment(info.lifespanStartTime).format("YYYY-MM-DD")} 至 ${moment(info.lifespanEndTime).format("YYYY-MM-DD")}`;
+        item.joinTime = `${moment(info.joinTime).format("YYYY-MM-DD")}`;
         item.nextLifespanTime = "不足90天";
         if (info.lifespanEndTime < ( NowMs + (30 * 24 * 3600 * 1000) ) ) item.nextLifespanTime = "不足30天";
     
@@ -175,6 +176,7 @@ export async function getRenewalPeriod({unitName, joinStartTime, joinEndTime, me
             item.nextLifespanTime = "过期1年及以上";
         }
     
+        item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
         item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
         dataList.push(item);

src/biz/member/order.ts

@@ -290,7 +290,7 @@ export async function upInvoice({id, invoiceUrl}) {
     let orderInfo = await findOnce(TABLEENUM.订单表, {id});
 
     if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
-    if (orderInfo.invoiceStatus != INVOICESTATUS.未开发票) throw new BizError(ERRORENUM.订单状态无法开具发票, `${orderInfo.id}无法开具发票，因为发票状态为${orderInfo.invoiceStatus}`);
+    if (orderInfo.invoiceStatus != INVOICESTATUS.未开发票 && orderInfo.invoiceStatus != INVOICESTATUS.已开发票 ) throw new BizError(ERRORENUM.订单状态无法开具发票, `${orderInfo.id}无法开具发票，因为发票状态为${orderInfo.invoiceStatus}`);
     
     let updateInfo = {
         invoiceStatus : INVOICESTATUS.已开发票,