dd

xgg-saas-merchant/app/base/controller/impl/uc/userCtl.js

@@ -43,9 +43,9 @@ class UserCtl extends CtlBase {
 
 
   async setLogin(user) {
   async setLogin(user) {
     let loginsid = "saasmcth_" + uuidv4();
     let loginsid = "saasmcth_" + uuidv4();
-    if (settings.env = "dev") {
-      loginsid = "saasmcth_" + "2cb49932-fa02-44f0-90db-9f06fe02e5c7";
-    }
+    // if (settings.env = "dev") {
+    //   loginsid = "saasmcth_" + "2cb49932-fa02-44f0-90db-9f06fe02e5c7";
+    // }
     await this.redisClient.setWithEx(loginsid, JSON.stringify(user), 60 * 60 * 5);
     await this.redisClient.setWithEx(loginsid, JSON.stringify(user), 60 * 60 * 5);
     return loginsid;
     return loginsid;
   }
   }

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

@@ -31,6 +31,11 @@ class InvoiceService extends ServiceBase {
         return rs;
         return rs;
     }
     }
 
 
+    async applyBulkSave(params) {
+        let rs = await this.callms("invoice", "invoiceapplyBulkSave", params);
+        return rs;
+    }
+
     transOrderField(rows) {
     transOrderField(rows) {
         if (!rows || rows.length == 0) {
         if (!rows || rows.length == 0) {
             return;
             return;

xgg-saas-merchant/app/base/system.js

@@ -121,6 +121,13 @@ class System {
 		}
 		}
 		return (Number(y) * 100).toFixed(0);
 		return (Number(y) * 100).toFixed(0);
 	}
 	}
+	static toFloat(f, digits) {
+		digits = digits || 2;
+		if (!f) {
+			return 0;
+		}
+		return parseFloat((Number(f)).toFixed(digits));
+	}
 
 
 	static f2y(f) {
 	static f2y(f) {
 		if (!f) {
 		if (!f) {
@@ -187,10 +194,10 @@ class System {
 				merchant: dev + ":3101" + path,
 				merchant: dev + ":3101" + path,
 
 
 				// 订单服务
 				// 订单服务
-				order: local + ":3103" + path,
+				order: dev + ":3103" + path,
 
 
 				// 发票服务
 				// 发票服务
-				invoice: local + ":3105" + path,
+				invoice: dev + ":3105" + path,
 
 
 				// 用户服务
 				// 用户服务
 				uc: dev + ":3106" + path,
 				uc: dev + ":3106" + path,

xgg-saas-merchant/app/config/settings.js

@@ -128,18 +128,13 @@ var settings = {
   deliverSysApi: function () {
   deliverSysApi: function () {
     let domain = "";
     let domain = "";
     if (this.env == "dev") {
     if (this.env == "dev") {
-      // domain = "http://39.107.234.14:3002";
-      domain = "http://127.0.0.1:3002";
+      domain = "http://39.107.234.14:3002";
     } else {
     } else {
       domain = "https://xggadmin.gongsibao.com";
       domain = "https://xggadmin.gongsibao.com";
     }
     }
     return {
     return {
-      // 推送订单s
-      orderPushApi: domain + "/web/order/orderCtl/addSourceOrder",
-      // 获取个体工商户信息
-      info: domain + "/web/business/businessmenCtl/info",
-      //获取工商户列表
-      businessmenPage:"/web/business/businessmenCtl/businessmenPage",
+      //发票是试算
+      calcInvoice: domain + "/web/invoice/invoiceCtl/calcInvoice",
     }
     }
   },
   },
   redis: function () {
   redis: function () {