Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/api/impl/payment/paymentApi.js

@@ -45,6 +45,9 @@ class PaymentAPI extends WEBBase {
             case "queryOrder"://通联支付查询
                 opResult = await this.utilsOrderSve.queryOrder(pobj, pobj.actionBody);
                 break;
+            case "getPayRecords"://获取支付记录
+                opResult = await this.utilsOrderSve.getPayRecords(pobj,pobj.actionBody);
+                break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 break;

center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js

@@ -362,6 +362,9 @@ class UtilsNeedService extends AppServiceBase {
       }
       actionBody.newuserOtherList = newuserOtherList;
     }
+    if (actionBody.isDirectBuy&&(actionBody.status == 1||actionBody.status == 0)) {//已支付直购不调用
+      return system.getResultSuccess();
+    }
     pobj.actionType = "receiveIcpStatusNotify";
     var url = settings.centerOrderUrl() + "action/qcapi/springBoard";
     var rtn = await this.restPostUrl(pobj, url);
@@ -370,7 +373,7 @@ class UtilsNeedService extends AppServiceBase {
         actionBody: {
           orderNo: rtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
           needsolution: rtn.data.solutionContent,
-          channelNeedNo: rtn.data.channelNeedNo,
+          channelNeedNo: rtn.data.channelNeedNo||"",
           channelSolutionNo: rtn.data.channelSolutionNo,
           servicer: {
             code: 'gsb',
@@ -1182,7 +1185,8 @@ class UtilsNeedService extends AppServiceBase {
         var deliveryObj = {
           actionBody: {
             // 2020 1019 lin 修改 orderrtn.data.orderNo 为 pobj.actionBody.orderNo
-            orderNo: pobj.actionBody.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
+            // 2020 1020 lin 修改 pobj.actionBody.orderNo 为 orderrtn.data.channelOrderNo
+            orderNo: orderrtn.data.channelOrderNo,//pobj.actionBody.channelOrder.channelOrderNo,
             needsolution: solutiondata.data.solutionContent,
             channelNeedNo: solutiondata.data.channelNeedNo,
             channelSolutionNo: solutiondata.data.channelSolutionNo,
@@ -1249,7 +1253,8 @@ class UtilsNeedService extends AppServiceBase {
     if ((actionBody.operationType == "USER_UPLOAD_PRODUCE") && rtn.data) {
       var deliveryObj = {
         actionBody: {
-          orderNo: rtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
+          // 2020 1020 lin 新增 orderNo也要改为p开头的订单号 想想怎么做 在receiveEdiStatusNotify查询了order。把channelOrderNo返回了
+          orderNo: rtn.data.channelOrderNo,//pobj.actionBody.channelOrder.channelOrderNo,
           needsolution: rtn.data.solutionContent,
           channelNeedNo: rtn.data.channelNeedNo,
           channelSolutionNo: rtn.data.channelSolutionNo,
@@ -1264,16 +1269,20 @@ class UtilsNeedService extends AppServiceBase {
       this.utilsPushSve.aliBusiness2Delivery(deliveryObj, "pushDeliveryOrder");
     }
     if (rtn.status == 0 && actionBody.operationType != "USER_PAY_PRODUCE" && actionBody.operationType != "USER_UPLOAD_PRODUCE" && rtn.data) {
+      console.log("pushDeliveryStatusNotify start ------")
       var tmpObj = {
         actionBody: {
-          orderNo: rtn.data.orderNo,
+          orderNo: rtn.data.channelOrderNo,
           channelNeedNo: rtn.data.channelNeedNo,
           needsolution: rtn.data.solutionContent
         },
         appInfo: pobj.appInfo
       }
       console.log(tmpObj)
-      this.utilsPushSve.aliBusiness2Delivery(tmpObj, "pushDeliveryStatusNotify");
+      var res = await this.utilsPushSve.aliBusiness2Delivery(tmpObj, "pushDeliveryStatusNotify");
+      console.log("res")
+      console.log(res);
+      console.log("pushDeliveryStatusNotify end ------")
       pobj.actionBody.orderNo = rtn.data.orderNo;
       if (actionBody.operationType == "ABC_CLOSE_PRODUCE") {
         var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);

center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js

@@ -1218,5 +1218,12 @@ class UtilsOrderService extends AppServiceBase {
     }
     return system.getResultSuccess(result)
   }
+
+  //获取支付记录
+  async getPayRecords(pobj,actionBody){
+    let url = this.centerOrderUrl + 'opaction/opPayOrder/getPayRecords';
+    let result = await this.restPostUrl(pobj,url);
+    return result;
+  }
 }
 module.exports = UtilsOrderService;

center-channel/app/config/routes/api.js

@@ -282,7 +282,7 @@ module.exports = function (app) {
 			"needBatchUpload",
 			"serviceSubmitOption","submitWangwenSolution","closeNeed","recordLog","recordLogList",
 			"foodServiceSubmitOption","submitFoodSolution","foodCloseNeed","foodRecordLog","foodRecordLogList",
-			"getParamsFor360","addOrderWeb",
+			"getParamsFor360","addOrderWeb","getPayRecords",
 
 		];
 		if (lst.indexOf(req.body.actionType) >= 0) {

center-channel/app/front/entry/public/apidoc/paymentDesc/payment.md

@@ -3,6 +3,7 @@
 1. [pc端订单支付二维码生成](#getOrderQrCode)
 1. [pc端查询订单是否支付成功](#getOrderQrCode)
 1. [获取H5支付链接](#getH5PayUrl)
+1. [获取支付记录](#getPayRecords)
 
 ## **<a name="getOrderQrCode"> pc端订单支付二维码生成</a>**
 [返回到目录](#menu)
@@ -86,3 +87,51 @@
 }
 
 ```
+
+
+## **<a name="getPayRecords"> 获取支付记录</a>**
+[返回到目录](#menu)
+##### URL
+[/web/payment/paymentApi/springBoard]
+#### 参数格式  `JSON`人
+#### HTTP请求方式 `POST`
+#### 请求头中需要增加userpin（用户登录后的凭证）的值
+#### 渠道执行的类型 actionType：getPayRecords
+
+``` javascript
+{}
+
+```
+
+#### 返回结果
+```javascript
+{
+    "status": 0,
+    "msg": "success",
+    "data": [
+        {
+            "orderNo": "OT38202009210844xFni",//订单号
+            "productName": "公司注册（北京市）",//产品名称
+            "totalSum": "0.01", //金额
+            "directionType": "sr",//凭单类型,"sr": "收","zc": "支"
+            "payTime": "2020-09-21T00:44:27.000Z"//支付时间
+        },
+        {
+            "orderNo": "OT382020092111563TOs",
+            "productName": "公司注册（北京市）",
+            "totalSum": "0.01",
+            "directionType": "sr",
+            "payTime": "2020-09-21T03:57:09.000Z"
+        },
+        {
+            "orderNo": "OT382020092114549S55",
+            "productName": "公司注册（北京市）",
+            "totalSum": "0.01",
+            "directionType": "sr",
+            "payTime": "2020-09-21T06:55:07.000Z"
+        }
+    ],
+    "requestId": "57144de54ea54e3abbaedd1512c34950"
+}
+
+```