Merge branch 'xgg-saas-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-merchant

xgg-saas-merchant/app/base/controller/impl/saas/invoiceCtl.js

@@ -74,8 +74,6 @@ class InvoiceCtl extends CtlBase {
       } else {
       } else {
         return system.getResult(null, "费用类型错误");
         return system.getResult(null, "费用类型错误");
       }
       }
-
-
       return await this.orderSve.page(params);
       return await this.orderSve.page(params);
     } catch (error) {
     } catch (error) {
       let msg = error.message;
       let msg = error.message;
@@ -84,8 +82,6 @@ class InvoiceCtl extends CtlBase {
       }
       }
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
-
-
   }
   }
 
 
   // 功能2开票
   // 功能2开票

xgg-saas-merchant/app/base/service/impl/saas/invoiceSve.js

@@ -25,6 +25,9 @@ class InvoiceService extends ServiceBase {
 
 
     async applySave(params) {
     async applySave(params) {
         var rs = await this.callms("invoice", "invoiceapplySave", params);
         var rs = await this.callms("invoice", "invoiceapplySave", params);
+        if (rs && rs.data && rs.data.rows) {
+            this.transOrderField(rs.data.rows);
+        }
         return rs;
         return rs;
     }
     }
 
 
@@ -35,6 +38,7 @@ class InvoiceService extends ServiceBase {
 
 
         for (let row of rows) {
         for (let row of rows) {
             row.price = system.f2y(row.price);
             row.price = system.f2y(row.price);
+            row.invoice_amount = system.f2y(row.invoice_amount);
         }
         }
     }
     }
 
 

xgg-saas-merchant/app/base/service/impl/trade/tradeSve.js

@@ -133,6 +133,16 @@ class TradeService extends ServiceBase {
 
 
     // 封装返回对象
     // 封装返回对象
     result.error = error;
     result.error = error;
+    if (result.error) {
+      // 处理错误信息
+      for (let idx = 0; idx < itemList.length; idx ++) {
+        let item = itemList[idx];
+        if (item.errors && item.errors.length > 0) {
+          let len = Number(idx) + 7;
+          return system.getResult(null, `第${len}行错误，` + item.errors.join("、"));
+        }
+      }
+    }
     result.itemList = itemList;
     result.itemList = itemList;
     return system.getResultSuccess(result);
     return system.getResultSuccess(result);
   }
   }