gsb

xggsve-invoice/app/base/db/impl/invoice/iinvoicedeliverDao.js

@@ -47,7 +47,7 @@ class IinvoicedeliverDao extends Dao {
     sql.push("t1.businessmen_mobile, t1.businessmen_bank, t1.businessmen_account,");
     sql.push("t1.merchant_name, t1.merchant_credit_code, t1.merchant_addr,");
     sql.push("t1.merchant_mobile, t1.merchant_bank, t1.merchant_account,");
-    sql.push("t1.`created_at`, t1.`status`");
+    sql.push("t1.`created_at`, t1.`status`, t1.red_status");
     sql.push("FROM i_invoice_deliver t2");
     sql.push("INNER JOIN i_invoice t1 on t1.id = t2.invoice_id");
     sql.push("WHERE 1 = 1 ");

xggsve-invoice/app/base/service/impl/invoice/iinvoicedeliverSve.js

@@ -33,7 +33,7 @@ class IinvoicedeliverService extends ServiceBase {
     let list = await this.dao.pageByParams(params);
     if (list) {
       for (var item of list) {
-        item.red_status_name = "未红冲";
+        item.red_status_name = item.red_status ? "红冲": "未红冲";
         this.handleDate(item, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
         this.handleDate(item, ['invoice_time', 'apply_time'], 'YYYY-MM-DD');
       }