添加交付商文档

xgg-deliver/app/base/controller/impl/business/businessmenCtl.js

@@ -21,7 +21,6 @@ class BusinessmenCtl extends CtlBase {
         orderId: this.trim(pobj.orderId),
         bstatus: pobj.status,
       }
-
       return await this.businessmenSve.allPage(condition);
     } catch (error) {
       console.log(error);

xgg-deliver/app/base/controller/impl/invoice/invoiceCtl.js

@@ -264,5 +264,20 @@ class InvoiceCtl extends CtlBase {
       return system.getResultFail(500, `接口错误 错误信息 ${error}`);
     }
   }
+
+  /**
+   * 发票红冲列表
+   * @param {*} pobj 
+   * @param {*} pobj2 
+   * @param {*} req 
+   * @param {*} res 
+   */
+  async redRushList(pobj,pobj2,req,res){
+    try {
+      return await this.invoiceSve.apiRedrushList(pobj); 
+    } catch (error) {
+      return system.getResultFail(500, `接口错误 错误信息 ${error}`);
+    }
+  }
 }
 module.exports = InvoiceCtl;
\ No newline at end of file

xgg-deliver/app/base/controller/impl/order/orderCtl.js

@@ -125,7 +125,7 @@ class OrderCtl extends CtlBase {
         id: pobj.id,
         currentPage: pobj.currentPage || 1,
         pageSize: pobj.pageSize || 1,
-        orderId: this.trim(pobj.orderId),
+        orderId: this.trim(pobj.orderId) || this.trim(pobj.orderNo),
         status: this.trim(pobj.status),
         deliverId: "", //  TODO 传入具体办理人
       }

xgg-deliver/app/base/service/impl/invoice/invoiceSve.js

@@ -859,6 +859,14 @@ class InvoiceService extends ServiceBase {
     }
   }
 
+  async apiRedrushList(params){
+    try {
+      return await this.callms("invoice", "redrushList", params);
+    } catch (error) {
+      return system.getResult(-1, `系统错误 错误信息 ${error}`);
+    }
+  }
+
 
 }
 module.exports = InvoiceService;
\ No newline at end of file

xgg-deliver/app/base/system.js

@@ -189,8 +189,8 @@ class System {
 				invoice: "http://127.0.0.1:3105" + path,
 
 				// 发票服务
-				// uc: domain + ":3106" + path,
-				uc: "http://127.0.0.1:3106" + path,
+				uc: domain + ":3106" + path,
+				// uc: "http://127.0.0.1:3106" + path,
 			}
 		} else {
 			var odomain = "http://123.57.217.203"

xgg-deliver/app/config/routes/web.js

@@ -104,6 +104,7 @@ module.exports = function (app) {
 		if(req.loginUser) {
 			req.body.saas_id = req.loginUser.saas_id;
 			req.body.deliverId = req.loginUser.uctypeId || "";
+			req.body.delivererId = req.loginUser.uctypeId || "";
 		}
 
 		params.push(methodName);

xgg-deliver/app/front/entry/public/apidoc/README.md

@@ -56,7 +56,7 @@
 
 　　2 [全部发票](/doc/invoice/all.md)
 
-　　3 [发票办理](/doc/invoice/deliver.md)
+　　3 [交付商发票接口](/doc/invoice/deliver.md)
 
 　　4 [发票管理](/doc/invoice/info.md)