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

center-order/app/base/api/impl/opaction/opPayOrder.js

@@ -25,5 +25,11 @@ class OpPayOrder extends APIBase {
         var result = await this.orderinfoSve.opOrderPayCallBackChannel(pobj, pobj.appInfo);
         var result = await this.orderinfoSve.opOrderPayCallBackChannel(pobj, pobj.appInfo);
         return result;
         return result;
     }
     }
+
+    //获取支付记录
+    async getPayRecords(pobj,qobj,req){
+        let result = await this.orderinfoSve.getPayRecords(pobj);
+        return result;
+    }
 }
 }
 module.exports = OpPayOrder;
 module.exports = OpPayOrder;
\ No newline at end of file

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -138,7 +138,9 @@ class OrderInfoService extends ServiceBase {
         sourceOrderNo: orderNo,//交付订单号
         sourceOrderNo: orderNo,//交付订单号
         contactName: orderContact.contacts || "",//手机号
         contactName: orderContact.contacts || "",//手机号
         mobile: orderContact.mobile,//手机号
         mobile: orderContact.mobile,//手机号
-        email: orderContact.email || ""
+        email: orderContact.email || "",
+          tel:orderContact.tel ||"", //座机
+          fax:orderContact.fax || "" //传真
       };
       };
       await this.ordercontactsDao.create(customerContactObj, t);
       await this.ordercontactsDao.create(customerContactObj, t);
     }//渠道购买存在购买者手机号
     }//渠道购买存在购买者手机号
@@ -1910,5 +1912,22 @@ class OrderInfoService extends ServiceBase {
     let result = await this.customQuery(sql,updateParams)
     let result = await this.customQuery(sql,updateParams)
     return system.getResult(result);
     return system.getResult(result);
   }
   }
+
+  //获取支付记录
+  async getPayRecords(pobj){
+    const userInfo = pobj.userInfo;
+    let sql = `select m.sourceOrderNo orderNo,json_extract(o.serviceItemSnapshot,'$.channel_item_name') productName,m.recvAmount totalSum,m.directionType directionType,m.updated_at payTime
+                from 
+                c_moneyjourney m left join v_order o
+                on m.sourceOrderNo = o.orderNo
+                where 
+                m.channelUserId = :channelUserId and m.uapp_id = :uapp_id`
+    const searchWhere ={
+      channelUserId : userInfo.channel_userid,
+      uapp_id:pobj.appInfo.uapp_id
+    }
+    let seRet = await this.customQuery(sql,searchWhere);
+    return system.getResultSuccess(seRet)
+  }
 }
 }
 module.exports = OrderInfoService;
 module.exports = OrderInfoService;
\ No newline at end of file

center-order/app/base/service/impl/qcutils/aliyunqcSve.js

@@ -1005,13 +1005,14 @@ class AliyunQcService {
     var material = solutionContent.customerMaterial || {};
     var material = solutionContent.customerMaterial || {};
     if (ab.extInfo) {
     if (ab.extInfo) {
       // 退回修改理由
       // 退回修改理由
-      var extInfoJson = JSON.parse(ab.extInfo);
+      // var extInfoJson = JSON.parse(ab.extInfo);
+      var extInfoJson = ab.extInfo
       if(extInfoJson.rejectReason) {
       if(extInfoJson.rejectReason) {
         ab.rejectReason = extInfoJson.rejectReason,
         ab.rejectReason = extInfoJson.rejectReason,
         solutionContent.rejectReason = extInfoJson.rejectReason
         solutionContent.rejectReason = extInfoJson.rejectReason
       }
       }
       material.businessLicenseArr = ab.extInfo.businessLicenseArr;
       material.businessLicenseArr = ab.extInfo.businessLicenseArr;
-      material.idCardListArr = ab.idCardListArr;
+      material.idCardListArr = ab.extInfo.idCardListArr;
     }
     }
     solutionContent.customerMaterial = material;
     solutionContent.customerMaterial = material;
     solutionContent = JSON.stringify(solutionContent);
     solutionContent = JSON.stringify(solutionContent);
@@ -1032,6 +1033,12 @@ class AliyunQcService {
     var new_ns = await this.needsolutionDao.model.findOne({
     var new_ns = await this.needsolutionDao.model.findOne({
       where: { id: ns.id }, raw: true
       where: { id: ns.id }, raw: true
     });
     });
+    var orderInfo = await this.orderinfoDao.model.findOne({
+      where: {orderNo: new_ns.orderNo}, raw: true
+    })
+    if(orderInfo) {
+      new_ns.channelOrderNo = orderInfo.channelOrderNo
+    }
     return system.getResultSuccess(new_ns);
     return system.getResultSuccess(new_ns);
   }
   }