gsb

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

@@ -222,7 +222,8 @@ class OrderCtl extends CtlBase {
     if (!pobj.hasOwnProperty(`deliver_divide`)) {
     if (!pobj.hasOwnProperty(`deliver_divide`)) {
       return system.getResult(null, `参数错误 交付商分成不能为空`);
       return system.getResult(null, `参数错误 交付商分成不能为空`);
     }
     }
-    
+
+    pobj.deliver_divide = system.y2f(pobj.deliver_divide);
     try {
     try {
       return await this.orderSve.handleStatus(pobj);
       return await this.orderSve.handleStatus(pobj);
     } catch (error) {
     } catch (error) {

xgg-admin/app/base/service/impl/order/orderSve.js

@@ -2,6 +2,7 @@ const system = require("../../../system");
 const ServiceBase = require("../../svems.base")
 const ServiceBase = require("../../svems.base")
 const settings = require("../../../../config/settings")
 const settings = require("../../../../config/settings")
 class OrderService extends ServiceBase {
 class OrderService extends ServiceBase {
+
   constructor() {
   constructor() {
     super();
     super();
     this.pushapiSve = system.getObject("service.push.pushapiSve");
     this.pushapiSve = system.getObject("service.push.pushapiSve");
@@ -28,6 +29,11 @@ class OrderService extends ServiceBase {
 
 
   async orderInfo(params) {
   async orderInfo(params) {
     var rs = await this.callms("order", "orderInfo", params);
     var rs = await this.callms("order", "orderInfo", params);
+    if(rs.data) {
+      if (rs.data.orderDeliver && rs.data.orderDeliver.deliver_divide) {
+        rs.data.orderDeliver.deliver_divide = system.f2y(rs.data.orderDeliver.deliver_divide);
+      }
+    }
     return rs;
     return rs;
   }
   }
 
 
@@ -83,7 +89,6 @@ class OrderService extends ServiceBase {
     }
     }
   }
   }
 
 
-
   async pushDeliver(obj) {
   async pushDeliver(obj) {
     var status = obj.status;
     var status = obj.status;
     if (!status) {
     if (!status) {
@@ -165,5 +170,6 @@ class OrderService extends ServiceBase {
 
 
     await this.pushapiSve.push(options);
     await this.pushapiSve.push(options);
   }
   }
+
 }
 }
 module.exports = OrderService;
 module.exports = OrderService;
\ No newline at end of file