receiptvoucher

igirl-channel/app/base/service/impl/dborder/orderSve.js

@@ -878,6 +878,7 @@ class OrderService extends ServiceBase {
       if (orderInfo.orderPayStatus == "yfk") {
       if (orderInfo.orderPayStatus == "yfk") {
         
         
         var returnObj={
         var returnObj={
+          "payOrderNo":"",
           "busPayOrderCode": "",
           "busPayOrderCode": "",
           "code": orderInfo.orderNo,
           "code": orderInfo.orderNo,
           "app_id": app.id,
           "app_id": app.id,
@@ -886,12 +887,13 @@ class OrderService extends ServiceBase {
           "totalSum": orderInfo.totalSum,
           "totalSum": orderInfo.totalSum,
           "orderPayStatus": "yfk",
           "orderPayStatus": "yfk",
         };
         };
-        var orderReceiptVoucher = await this.orderReceiptVoucherDao.model.findOne({
-          where:{uapp_id:app.uAppId,sourceOrderNo:orderInfo.orderNo},
+        var orderReceiptVoucher = await this.receiptvoucherDao.model.findOne({
+          where:{createapp_id:app.id,busPayOrderCode:orderInfo.orderNo},
           raw:true
           raw:true
         });
         });
         if(orderReceiptVoucher && orderReceiptVoucher.busPayOrderCode){
         if(orderReceiptVoucher && orderReceiptVoucher.busPayOrderCode){
           returnObj.busPayOrderCode = orderReceiptVoucher.busPayOrderCode;
           returnObj.busPayOrderCode = orderReceiptVoucher.busPayOrderCode;
+          returnObj.payOrderNo = orderReceiptVoucher.payOrderNo;
         }
         }
         return system.getResultSuccess(returnObj);
         return system.getResultSuccess(returnObj);
       }
       }
@@ -1030,17 +1032,17 @@ class OrderService extends ServiceBase {
       }, t);
       }, t);
       //帐户类型（ 支付类型）:cash: 现金, bank: 银行 ,wx:微信,alipay:支付宝,other:其它
       //帐户类型（ 支付类型）:cash: 现金, bank: 银行 ,wx:微信,alipay:支付宝,other:其它
       var orderReceiptVoucherObj={
       var orderReceiptVoucherObj={
-        uapp_id:app.uAppId,
-        sourceOrderNo:orderItem.orderNo,   // 来源单号
+        receiptType:"sk",
+        itemCode:orderItem.itemCode,itemName:orderItem.itemName,
+        createapp_id:app.id,
+        payOrderNo:obj.trxid,
         accountType: accountType,
         accountType: accountType,
         payDate: new Date(),//支付时间
         payDate: new Date(),//支付时间
         totalSum: orderItem.totalSum,//订单总额
         totalSum: orderItem.totalSum,//订单总额
-        wxPayOrderCode:obj.trxid,//业务微信支付订单号
-        aliPayOrderCode:obj.trxid,//业务支付宝支付订单号
-        busPayOrderCode:obj.trxid,//业务支付订单号
-        auditStatus:"tg"
+        busPayOrderCode:orderItem.orderNo//业务支付订单号
       };
       };
-      var orderReceiptVoucher = await self.orderReceiptVoucherDao.create(orderReceiptVoucherObj,t);
+      var receiptVoucher = await this.receiptvoucherDao.create(orderReceiptVoucherObj,t);
+      // var orderReceiptVoucher = await self.orderReceiptVoucherDao.create(orderReceiptVoucherObj,t);
       var resdata = {
       var resdata = {
         "busPayOrderCode": obj.trxid,
         "busPayOrderCode": obj.trxid,
         "code": orderItem.orderNo,
         "code": orderItem.orderNo,