tj

7913f0d4 · 宋毅 · afc7df87 · 7913f0d4 · 7913f0d4 · 7913f0d4
Commit 7913f0d4 authored Apr 12, 2020 by 宋毅
Showing with 85 additions and 16 deletions

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

center-order/app/base/db/impl/dbcorder/orderproductDao.js
+2 -2

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

No files found.
--- a/center-order/app/base/api/impl/opaction/opPayOrder.js
+++ b/center-order/app/base/api/impl/opaction/opPayOrder.js
@@ -11,5 +11,9 @@ class OpPayOrder extends APIBase {
        var result = await this.orderinfoSve.opOrderPayCallBackTl(pobj, pobj.appInfo);
        return result;
    }
+    async receivePayCallBackNotifyByAliDing(pobj, qobj, req) {
+        var result = await this.orderinfoSve.opOrderPayCallBackAliDing(pobj, pobj.appInfo);
+        return result;
+    }
 }
 module.exports = OpPayOrder;
\ No newline at end of file
--- a/center-order/app/base/db/impl/dbcorder/orderproductDao.js
+++ b/center-order/app/base/db/impl/dbcorder/orderproductDao.js
@@ -10,7 +10,6 @@ class OrderProductDao extends Dao {
        sourceOrderNo: orderNo, uapp_id: uapp_id
      },
      attributes: [
-        "id",
        "sourceOrderNo",
        "productType_id",
        "pathCode",
@@ -23,7 +22,8 @@ class OrderProductDao extends Dao {
        "payAfterJumpPcUrl",
        "picUrl",
        "price",
-        "quantity"],
+        "quantity",
+        "serviceItemSnapshot"],
      raw: true
    });
  }

--- a/center-order/app/base/service/impl/dbcorder/orderinfoSve.js
+++ b/center-order/app/base/service/impl/dbcorder/orderinfoSve.js
@@ -756,6 +756,9 @@ class OrderInfoService extends ServiceBase {
    if (!item) {
      return system.getResult(null, "订单已经付款成功，请勿重复支付，30000");
    }
+    var produceinfo = JSON.parse(productItem.serviceItemSnapshot);
+    productItem.id = produceinfo.id;
+    productItem.serviceItemSnapshot = null;
    var param = {
      receiptVoucher: item,
      orderProduct: productItem
@@ -1161,7 +1164,7 @@ class OrderInfoService extends ServiceBase {
      };
      var moneyJourney = await self.moneyJourneyDao.create(moneyObj, t);
    });
+    item.orderStatus = 2;//已付款
    var resultParams = {
      order_info: item,
      delivery_content: null,//包含订单联系人orderContact
@@ -1178,6 +1181,66 @@ class OrderInfoService extends ServiceBase {
    return system.getResultSuccess(resultParams);
  }
+  async opOrderPayCallBackAliDing(parmas, appInfo) {//操作订单付款回调---阿里钉钉
+    var item = await this.dao.getItemStatusByOrderNo(parmas.orderNo)
+    if (!item) {
+      return system.getResult(null, "order data is empty!");
+    }
+    if (item.orderStatus > 1) {
+      return system.getResult(null, "order status is pay!");
+    }
+    var self = this;
+    await self.db.transaction(async function (t) {
+      await self.dao.updateByWhere({ orderStatus: 2, payTime: parmas.gmt_payment }, { where: { orderNo: parmas.orderNo } }, t);
+      var putFields = {
+        auditStatus: "tg",
+        accountType: parmas.pay_type,
+        passTradeNo: parmas.notify_id || "",//通知校验ID
+        payOrderNo: parmas.trade_no || "",//支付凭证流水单号，如：微信支付凭证单号--该交易在支付宝系统中的交易流水号。最短16位，最长64位。
+        busPayOrderCode: parmas.out_trade_no || "",//业务支付订单号
+        buyerOpenId: parmas.buyer_id || "",//用户在支付商户appid下的唯一标识或买家在支付宝的用户id    
+        buyerAliLogonId: parmas.buyer_email || "",//买家支付宝账号
+        updated_at: parmas.gmt_payment,//该笔交易的买家付款时间。格式为yyyy-MM-dd HH:mm:ss。
+        notes: parmas.gmt_create || ""//该笔交易创建的时间。格式为yyyy-MM-dd HH:mm:ss。
+      };
+      await self.orderReceiptVoucherDao.updateByWhere(putFields, { where: { sourceOrderNo: parmas.orderNo } }, t);
+      var orderLog = {
+        uapp_id: appInfo.uapp_id,
+        sourceOrderNo: parmas.orderNo,
+        opContent: "您成功支付了订单，请等待服务商服务",
+        isShow: 1
+      };
+      await self.flowlogDao.create(orderLog, t);
+      var moneyObj = {
+        uapp_id: appInfo.uapp_id,
+        sourceOrderNo: parmas.orderNo,   // 来源单号
+        channelUserId: item.channelUserId,
+        ownerUserId: item.ownerUserId,
+        accountType: parmas.pay_type,//帐户类型（ 支付类型）:"cash": "现金", "bank": "银行" ,"wx":"微信","alipay":"支付宝","other":"其它"
+        directionType: "sr",//凭单类型,"sr": "收","zc": "支"
+        voucherDate: parmas.gmt_payment,//new Date(),//凭单时间
+        recvAmount: item.totalSum,//收总额
+        sourceType: "orderinfo",//来源类型 "orderinfo": "订单","expensevoucher": "费用单"
+        auditStatus: "tg",//审核状态"dsh": "待审核", "btg": "不通过", "tg": "通过"
+      };
+      await self.moneyJourneyDao.create(moneyObj, t);
+    });
+    item.orderStatus = 2;//已付款
+    var resultParams = {
+      order_info: item,
+      delivery_content: null,//包含订单联系人orderContact
+      product_info: null
+    };
+    var deliveryInfoResult = await this.getOrderDeliveryInfo(null, parmas);
+    if (deliveryInfoResult && deliveryInfoResult.status == 0) {
+      resultParams.delivery_content = deliveryInfoResult.data;
+    }
+    var orderProductItem = await this.orderproductDao.getItemInfoByOrderNo(parmas.orderNo);
+    if (orderProductItem) {
+      resultParams.product_info = JSON.parse(orderProductItem.serviceItemSnapshot);
+    }
+    return system.getResultSuccess(resultParams);
+  }
  //-------------------------------服务商通知订单流程-------------end----------------
  //商标方案确认
  async tmConfirm(pobj) {
@@ -1205,7 +1268,7 @@ class OrderInfoService extends ServiceBase {
    }
    //获取订单信息
    var orderinfo = await this.dao.model.findOne({
-      where:{orderNo:orderNo,uapp_id:app.uapp_id},raw:true
+      where: { orderNo: orderNo, uapp_id: app.uapp_id }, raw: true
    });
    if (!orderinfo || !orderinfo.id) {
      return system.getResultFail(-110, "未知订单信息");
@@ -1215,7 +1278,7 @@ class OrderInfoService extends ServiceBase {
    }
    //获取交付单信息
    var orderdeliveryRes = await this.getOrderDelivery(orderNo);
-    if (!orderdeliveryRes || orderdeliveryRes.length<1) {
+    if (!orderdeliveryRes || orderdeliveryRes.length < 1) {
      return system.getResultFail(-104, "未知订单交付信息");
    }
    var orderdelivery = orderdeliveryRes[0];
@@ -1223,7 +1286,7 @@ class OrderInfoService extends ServiceBase {
    // if (!deliveryContent || !deliveryContent.deliveryStatus || deliveryContent.deliveryStatus != "dqrfa") {
    //   return system.getResultFail(-105, "方案确认失败，方案交付状态错误");
    // }
-    if(!deliveryContent.deliveryStatusList){
+    if (!deliveryContent.deliveryStatusList) {
      deliveryContent.deliveryStatusList = [];
    }
    return await self.db.transaction(async function (t) {
@@ -1234,10 +1297,10 @@ class OrderInfoService extends ServiceBase {
        isShow: 1
      };
      var orderInfoObj = {
-        id:orderinfo.id
+        id: orderinfo.id
      };
-      if(ab.notes){
+      if (ab.notes) {
-        orderInfoObj["opNotes"]=ab.notes;
+        orderInfoObj["opNotes"] = ab.notes;
      }
      if (isConfirm == "0") {
        if (!ab.notes) {
@@ -1248,11 +1311,11 @@ class OrderInfoService extends ServiceBase {
        deliveryContent["opNotes"] = ab.notes;
        orderLog["opContent"] = "商标方案不通过";
        deliveryContent.deliveryStatusList.push({
-          deliveryStatus:"fabtg",
+          deliveryStatus: "fabtg",
          deliveryStatusName: "方案不通过",
          deliveryUpdated: new Date()
        });
-        orderInfoObj["isSolution"]=0;
+        orderInfoObj["isSolution"] = 0;
      }
      if (isConfirm == "1") {
        deliveryContent["deliveryStatus"] = "dsh";
@@ -1260,14 +1323,14 @@ class OrderInfoService extends ServiceBase {
        deliveryContent["opNotes"] = ab.notes || "";
        orderLog["opContent"] = "商标方案确认通过";
        deliveryContent.deliveryStatusList.push({
-          deliveryStatus:"dsh",
+          deliveryStatus: "dsh",
          deliveryStatusName: "待审核",
          deliveryUpdated: new Date()
        });
-        orderInfoObj["isSolution"]=0;
+        orderInfoObj["isSolution"] = 0;
      }
-      self.putOrderDelivery(deliveryContent,orderNo);//修改订单交付信息
+      self.putOrderDelivery(deliveryContent, orderNo);//修改订单交付信息
      await self.dao.update(orderInfoObj, t);//修改订单信息
      await self.flowlogDao.create(orderLog, t);//添加流程信息
      // var pushObj = {//推送参数
@@ -1277,13 +1340,13 @@ class OrderInfoService extends ServiceBase {
      //   notes:ab.notes || ""
      // };
      orderdeliveryRes = await self.getOrderDelivery(orderNo);
-      if(orderdeliveryRes && orderdeliveryRes.length>0){
+      if (orderdeliveryRes && orderdeliveryRes.length > 0) {
        return system.getResultSuccess(orderdeliveryRes[0]);
      }
      return system.getResultSuccess();
    })
  }
 }
 module.exports = OrderInfoService;
\ No newline at end of file