tj

brg-user-center/app/base/api/impl/receive/entService.js

@@ -38,7 +38,7 @@ class EntService extends APIBase {
                 opResult = await this.orderDeliverySve.submitDeliveryInfo(pobj);
                 break;
             case "updateOrderStatus"://服务商修改订单交付状态
-                opResult = await this.orderDeliverySve.updateOrderStatus(pobj);
+                opResult = await this.orderDeliverySve.updateOrderStatus(pobj,req);
                 break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");

brg-user-center/app/base/service/impl/common/txPushLogSve.js

@@ -82,10 +82,13 @@ class TxPushLogService extends ServiceBase {
     if (!orderInfo) {
       return self.returnTX(-1, "cgateway", "资源不存在", null)
     }
-    var status = 0;
+    var status = 2;
     if (orderInfo.status == 320) {
       status = 3;
     }
+    if (orderInfo.status == 300) {
+      status = 0;
+    }
     return self.returnTX(0, "cgateway", "ok", { "status": status })
   }
 

brg-user-center/app/base/service/impl/order/orderInfoSve.js

@@ -267,9 +267,9 @@ class OrderInfoService extends ServiceBase {
     if (!ispush) {
       return system.getResultSuccess();
     }
-    txorderdetail.goodsDetail.formInfo.buyTime=new Date(txorderdetail.payEndTime);
-    txorderdetail.goodsDetail.formInfo.timeSpan=1;
-    txorderdetail.goodsDetail.formInfo.timeUnit="y";
+    txorderdetail.goodsDetail.formInfo.buyTime = new Date(txorderdetail.payEndTime);
+    txorderdetail.goodsDetail.formInfo.timeSpan = 1;
+    txorderdetail.goodsDetail.formInfo.timeUnit = "y";
     //生产者------订单推送
     var pushobj = {
       "actionType": "produceData",// Y 功能名称
@@ -847,9 +847,12 @@ class OrderInfoService extends ServiceBase {
     if (!orderProduct) {
       return system.getResultFail(-101, "orderProduct is empty");
     }
-    if(orderProduct.status == 320) {
+    if (orderProduct.status == 320) {
       return system.getResultSuccess();
     }
+    if (orderProduct.status == 300) {
+      return system.getResultFail(-301, "订单状态错误");
+    }
     var productType = "p_business_registration";
     if (orderProduct.dataValues.product_type.indexOf("/qcfw/") > -1) {
       productType = "p_vat";
@@ -868,12 +871,13 @@ class OrderInfoService extends ServiceBase {
           "msgContent": {
             "type": orderProduct.tx_order_snapshot.goodsDetail.goodsSubType,
             "dealName": pobj.orderNum,
-            "deliveryResult": 3
+            "deliveryResult": 3,
+            "resourceIds": [pobj.orderNum]
           }
         }
       }
     }
-    var r = await this.execPostByTimeOut(req,o, "http://msgqueue.sandbox.com");
+    var r = await this.execPostByTimeOut(req, o, "http://msgqueue.sandbox.com");
     if (r.status < 1) {
       return system.getResultFail(-102, "Post error");
     }

brg-user-center/app/config/platform.js

@@ -4,7 +4,7 @@ module.exports = {
             push_return_type: { "0": "推送失败", "1": "推送成功" },
             pay_type:{"1":"微信","2":"qq钱包","3":"网银支付","4":"余额支付"},
             order_op_type:{"1":"收","2":"支"},
-            order_status:{"0":"待付款","1":"已付款", "310":"部分已退款","320":"已退款","330":"已作废"},
+            order_status:{"0":"待付款","1":"已付款", "310":"部分已退款","320":"已退款","330":"已作废","300":"已完成"},
             order_delivery_status:{
                 "1":"待接单",
                 "20":"已接单",