gsb

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

@@ -120,10 +120,10 @@ class InvoiceCtl extends CtlBase {
 
     let info = await this.merchantSve.signInfo({id: params.saas_merchant_id}) || {};
     info = info.data || {};
-    if (!info.main_trade || !info.main_trade.id) {
-      return system.getResult(null, "商户未设置转账交易主体，请联系平台进行设置、");
+    if (!info.main_invoice || !info.main_invoice.id) {
+      return system.getResult(null, "商户未设置开票签约主体，请联系平台进行设置、");
     }
-    let main = info.main_trade || {};
+    let main = info.main_invoice || {};
     let batch_no = await this.redisClient.genrateId("invoice_batch_no");
     let apply_no = await this.redisClient.genrateId("invoice_apply_no");
     let data = {
@@ -194,10 +194,10 @@ class InvoiceCtl extends CtlBase {
       let info = await this.merchantSve.signInfo({id: params.saas_merchant_id}) || {};
       info = info.data || {};
       // TODO WK
-      if (!info.main_trade) {
-        return system.getResult(null, "商户未设置转账交易主体，请联系平台进行设置、");
+      if (!info.main_invoice) {
+        return system.getResult(null, "商户未设置开票签约主体，请联系平台进行设置、");
       }
-      let main = info.main_trade;
+      let main = info.main_invoice;
       let invoiceList = params.invoiceList;
 
       let creditCodes = [];
@@ -218,7 +218,7 @@ class InvoiceCtl extends CtlBase {
       let batch_no = await this.redisClient.genrateId("invoice_batch_no");
       for (let invoice of invoiceList) {
         if (!invoice.data_ids) {
-          return system.getResult(null, "数据异常，请刷新重试");
+          return system.getResult(null, "数据有变化，请刷新重试");
         }
 
         let bussinessmen = businessmenMap[invoice.credit_code];
@@ -365,10 +365,10 @@ class InvoiceCtl extends CtlBase {
     let info = await this.merchantSve.signInfo({id: params.saas_merchant_id}) || {};
     // service_tax
     info = info.data || {};
-    if (!info.main) {
-      return system.getResult(null, "商户未设置转账交易主体，请联系平台进行设置、");
+    if (!info.main_invoice) {
+      return system.getResult(null, "商户未设置开票签约主体，请联系平台进行设置、");
     }
-    let main = info.main || {};
+    let main = info.main_invoice || {};
     let batch_no = await this.redisClient.genrateId("invoice_batch_no");
     let apply_no = batch_no;
     let service_tax = parseFloat((Number(invoice_amount) * Number(info.invoice_service_rate) / 100).toFixed(2));
@@ -477,17 +477,17 @@ class InvoiceCtl extends CtlBase {
       unInvoice: true,
     }) || [];
     items = items.data;
-    if (!items || items.length == 0) {
-      return system.getResult(null, "交易信息有误，请刷新重新选择");
+    if (!items || params.data_ids.length != items.length) {
+      return system.getResult(null, "交易信息有变化，请刷新重新选择");
     }
     let signInfo = await this.merchantSve.signInfo({id: params.saas_merchant_id});
     if (!signInfo || !signInfo.data) {
       return system.getResult(null, "商户签约信息不存在，请先做签约配置");
     }
 
-    // TODO WK 改成开票签约主体
-    let main = signInfo.data.main_trade;
-    if (!main) {
+    // 开票签约主体
+    let main = signInfo.data.main_invoice;
+    if (!main || !main.id) {
       return system.getResult(null, "开票签约主体未设置，请联系平台配置");
     }
 

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

@@ -157,6 +157,9 @@ class MerchantService extends ServiceBase {
       if(row.main_id_trade) {
         mainIds.push(row.main_id_trade);
       }
+      if(row.main_id_invoice) {
+        mainIds.push(row.main_id_invoice);
+      }
     }
     if(mainIds.length == 0) {
       return;
@@ -166,6 +169,7 @@ class MerchantService extends ServiceBase {
     for(let row of rows) {
       row.main = map[row.main_id] || {};
       row.main_trade = map[row.main_id_trade] || {};
+      row.main_invoice = map[row.main_id_invoice] || {};
     }
   }