no message

src/biz/member/order.ts

@@ -721,7 +721,7 @@ export async function refundOut({id, desc}) {
 /**
  * 审批历史
  */
-export async function approveLog({id}) {
+ export async function approveLog({id}) {
     let logsList = await find(TABLEENUM.订单审批历史表, {orderId:id});
 
     let dataList = [];
@@ -729,28 +729,71 @@ export async function approveLog({id}) {
         let { operationTime, operationBehavior, isReceiveMoney, remarks } = info;
 
         let desc = "";
-        if (operationBehavior == ORDEREXAMINE.用户提交) desc = "线下付款";
+        let operationBehaviorStr = "";
+        if (operationBehavior == ORDEREXAMINE.用户提交) desc = "未收到/已收到"; //线下付款
         else {
             if (isReceiveMoney) {
-                desc = "未收到"
+                operationBehaviorStr = "不需退款";
+                desc = "未收到/已收到"
             } else {
+                operationBehaviorStr = "需退款";
                 desc = "已收到"
             }
             // desc = isReceiveMoney ? changeEnumValue(ISRECEIVE, ISRECEIVE.未收到款项_xg其他) : changeEnumValue(ISRECEIVE, ISRECEIVE.提供账户_zkh需退款_ykh)
         } 
         let addInfo:any = {
-            operationTime:moment(operationTime).format("YYYY-MM-DD HH:mm:SS"),
-            operationBehavior:changeEnumValue(ORDEREXAMINE, operationBehavior),
+            operationTime,
+            // operationTime:moment(operationTime).format("YYYY-MM-DD HH:mm:SS"),
+            operationBehavior:operationBehaviorStr,
             desc,
             other:remarks
         };
         dataList.push(addInfo);
-        
     } );
 
-    return {dataList};
+    dataList.sort( (a, b) => {
+        return b.operationTime - a.operationTime;
+    })
+
+    let changeSortData = [];
+    dataList.forEach( info => {
+        info.operationTime = moment(info.operationTime).format("YYYY-MM-DD HH:mm:SS");
+        changeSortData.push(info);
+    })
+
+    return {dataList:changeSortData};
 }
 
+// export async function approveLog({id}) {
+//     let logsList = await find(TABLEENUM.订单审批历史表, {orderId:id});
+
+//     let dataList = [];
+//     logsList.forEach(info => {
+//         let { operationTime, operationBehavior, isReceiveMoney, remarks } = info;
+
+//         let desc = "";
+//         if (operationBehavior == ORDEREXAMINE.用户提交) desc = "线下付款";
+//         else {
+//             if (isReceiveMoney) {
+//                 desc = "未收到"
+//             } else {
+//                 desc = "已收到"
+//             }
+//             // desc = isReceiveMoney ? changeEnumValue(ISRECEIVE, ISRECEIVE.未收到款项_xg其他) : changeEnumValue(ISRECEIVE, ISRECEIVE.提供账户_zkh需退款_ykh)
+//         } 
+//         let addInfo:any = {
+//             operationTime,
+//             // operationTime:moment(operationTime).format("YYYY-MM-DD HH:mm:SS"),
+//             operationBehavior:changeEnumValue(ORDEREXAMINE, operationBehavior),
+//             desc,
+//             other:remarks
+//         };
+//         dataList.push(addInfo);
+//     } );
+
+//     return {dataList};
+// }
+
 
 export async function reconfirm({id, weChartPR, offlinePaymentUrl, desc}) {
     let orderInfo = await findOnce(TABLEENUM.订单表, {id});

src/main.ts

@@ -29,7 +29,7 @@ async function lanuch() {
     // console.log(moment(1498262400000).format("YYYY-MM-DD HH:mm:SS"))
     console.log("服务初始化成功");
     // await sendMail("18711017326@163.com");
-    // await testCallback("40a4e33658fa681429b9990434675c24")
+    await testCallback("e793d4b37c2eac2de13b4df69fa2cc18")
 }
 
 lanuch();