gsb

xgg-saas-merchant/app/base/service/impl/trade/tradeSve.js

@@ -35,6 +35,13 @@ class TradeService extends ServiceBase {
     // 计算预计付款金额
     let result = await this.countAmt(itemList, info);
 
+    for (let item of itemList) {
+      item.amt = system.y2f(item.actual_amt);
+      item.actual_amt = system.y2f(item.actual_amt);
+      item.deduct_amt = system.y2f(item.deduct_amt);
+      item.service_tax = system.y2f(item.service_tax);
+    }
+
     let out_trade_no = await this.redisClient.genrateId("gsb_out_trade_no");
     // 构建订单对象
     let order = {
@@ -42,10 +49,10 @@ class TradeService extends ServiceBase {
       saas_merchant_id: params.saas_merchant_id,
       out_trade_no: out_trade_no,
       service_rate: system.f2y(info.trans_service_rate),
-      amt: result.actual_amt,
-      actual_amt: result.actual_amt,
-      deduct_amt: result.deduct_amt,
-      service_tax: result.service_tax,
+      amt: system.y2f(result.actual_amt),
+      actual_amt: system.y2f(result.actual_amt),
+      deduct_amt: system.y2f(result.deduct_amt),
+      service_tax: system.y2f(result.service_tax),
       item_count: itemList.length,
       acc_type: params.acc_type,
       order_file: params.fileUrl,

xgg-saas-merchant/app/front/entry/public/apidoc/saas/trade.md

@@ -13,14 +13,6 @@
 #### HTTP请求方式 `POST`
 
 ``` javascript
-订单状态 下拉筛选
-1010 待付款, 
-2010 待审核, 
-2030 审核驳回, 
-3010 业务办理中, 
-3020 待交付, 
-3030 已交付
-
 {
     "currentPage": "1",
     "pageSize": "10",
@@ -115,12 +107,18 @@
                   "错误信息1",
                   "错误信息2",
                 ],
-                "acc_name": "11",
-                "credit_code": "92321311MA205KN92J",
-                "acc_no": "3",
-                "open_bank": "4",
-                "amt": "5",
-                "remark": "6"
+                "acc_name": "11",                         // 收款户名
+                "credit_code": "92321311MA205KN92J",      // 统一社会信用代码
+                "acc_no": "3",                            // 收款账号
+                "open_bank": "4",                         // 开户银行
+                "open_bank": "4",                         // 开户银行
+                "amt": "5",                               // 请求打款金额
+                "remark": "6",                            // 备注
+                
+                // ※※※※※※※※ 以下字段不允许编辑 ※※※※※※※※※※※
+                "service_tax": "0.10",                    // 服务费
+                "actual_amt": "5.00",                     // 实发金额
+                "deduct_amt": "5.10"                      // 扣除金额
             },
         ]
     }
@@ -141,7 +139,28 @@
 ``` javascript
 
 {
-    "ids": ['172...', '172..', ''],     // 订单多选
+    "acc_type": "00",
+    "fileUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_273315857206750512020113575551testbank2.xlsx",
+    "itemList": [
+        {
+            "errors": [               // 错误信息数组，多条，都在页面展示吧
+              "错误信息1",
+              "错误信息2",
+            ],
+            "acc_name": "11",                         // 收款户名
+            "credit_code": "92321311MA205KN92J",      // 统一社会信用代码
+            "acc_no": "3",                            // 收款账号
+            "open_bank": "4",                         // 开户银行
+            "open_bank": "4",                         // 开户银行
+            "amt": "5",                               // 请求打款金额
+            "remark": "6",                            // 备注
+            
+            // ※※※※※※※※ 以下字段不允许编辑 ※※※※※※※※※※※
+            "service_tax": "0.10",                    // 服务费
+            "actual_amt": "5.00",                     // 实发金额
+            "deduct_amt": "5.10"                      // 扣除金额
+        },
+    ]
 }
 
 ```
@@ -152,12 +171,22 @@
 {
     "status": 0,
     "msg": "操作成功",
-    "data": {
-        "totalNum": 3,                              // 共 XX 笔订单
-        "totalPrice": 4500,                         // 应付金额 元
-        "account_name": "扬大",                     // 账户名称
-        "account_bank_name": "中国银行",            // 开户银行
-        "account_bank_no": "222"                   // 银行账户 
+    "data":  {
+        "id": "1298533711001487",               // 订单id
+        "out_trade_no": "13695851544002235",    // 商户订单号
+        "amt": 131083.32,
+        "actual_amt": 131083.32,
+        "deduct_amt": 128535.56,
+        "service_tax": 2621.66,
+        "item_count": 4,
+        "acc_type": "00",
+        "order_file": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_273315857206750512020113575551testbank2.xlsx",
+        "pay_voucher": "",
+        "pay_bank_account": "111xxx",
+        "pay_bank_name": "1231234",
+        "pay_bank_no": "123456",
+        "updated_at": "2020-04-01T10:38:28.474Z",
+        "created_at": "2020-04-01T10:38:28.474Z"
     },
     "bizmsg": "empty"
 }