dd

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

@@ -194,10 +194,10 @@ class InvoiceCtl extends CtlBase {
 
 
     let info = await this.merchantSve.signInfo({id: params.saas_merchant_id}) || {};
     let info = await this.merchantSve.signInfo({id: params.saas_merchant_id}) || {};
     info = info.data || {};
     info = info.data || {};
-    if (!info.main_trade) {
+    if (!info.main) {
       return system.getResult(null, "商户未设置转账交易主体，请联系平台进行设置、");
       return system.getResult(null, "商户未设置转账交易主体，请联系平台进行设置、");
     }
     }
-    let main = info.main_trade || {};
+    let main = info.main || {};
     let batch_no = await this.redisClient.genrateId("invoice_batch_no");
     let batch_no = await this.redisClient.genrateId("invoice_batch_no");
     let apply_no = batch_no;
     let apply_no = batch_no;
     let data = {
     let data = {

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

@@ -61,6 +61,15 @@ class OrderService extends ServiceBase {
       row.price = system.f2y(row.price);
       row.price = system.f2y(row.price);
     }
     }
   }
   }
+  async byIds(params) {
+    let rs = await this.callms("order", "itemByIds", params);
+    return rs;
+  }
+
+  async updateInvoice(params) {
+    let rs = await this.callms("order", "updateItemInvoice", params);
+    return rs;
+  }
 
 
 }
 }
 module.exports = OrderService;
 module.exports = OrderService;
\ No newline at end of file