tj

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

@@ -116,14 +116,13 @@ class OrderService extends ServiceBase {
   }
   }
   //更新订单状态
   //更新订单状态
   async updateOrderStatus(action_body, pobj, req) {
   async updateOrderStatus(action_body, pobj, req) {
-    var setObj = {};
-    if (pobj.actionProcess == "jd") {
-      setObj.channelServiceNo = action_body.channelServiceNo;
-      setObj.needNo = action_body.needNo;
-      setObj.needNoOrderNo = action_body.needNoOrderNo;
-    }
-    await this.dao.updateByWhere(setObj, { where: { orderNo: action_body.orderNo } });
-    return system.getResultSuccess();
+    var setObj = { channelServiceNo: action_body.channelServiceNo, needNo: action_body.needNo, needNoOrderNo: action_body.needNoOrderNo };
+    var self = this;
+    return await this.db.transaction(async function (t) {
+      await self.dao.updateByWhere(setObj, { where: { orderNo: action_body.orderNo } }, t);
+      await self.ordertmproductDao.updateByWhere(setObj, { where: { orderNo: action_body.orderNo } }, t);
+      return system.getResultSuccess();
+    });
   }
   }
   //更新付款状态
   //更新付款状态
   async updateOrderPayStatus(action_body, pobj, req) {
   async updateOrderPayStatus(action_body, pobj, req) {

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

@@ -545,7 +545,7 @@ class OrderTmProductService extends ServiceBase {
     if (pageSize > 50) {
     if (pageSize > 50) {
       pageSize = 50;
       pageSize = 50;
     }
     }
-    var sql = "SELECT tm.`channelServiceNo`,tm.`deliveryOrderNo`,tm.`tmName`,tm.`nclOneCount`,tm.`nclOneCodes`,tm.itemCode,tm.itemName," +
+    var sql = "SELECT tm.`needNo`,tm.`channelServiceNo`,tm.`deliveryOrderNo`,tm.`tmName`,tm.`nclOneCount`,tm.`nclOneCodes`,tm.itemCode,tm.itemName," +
       " o.`totalSum`,c.`name`,tm.`deliveryStatus`,tm.`deliveryStatusName`,tm.payStatus,tm.payStatusName,o.payTime AS CreateDate,tm.submitTime," +
       " o.`totalSum`,c.`name`,tm.`deliveryStatus`,tm.`deliveryStatusName`,tm.payStatus,tm.payStatusName,o.payTime AS CreateDate,tm.submitTime," +
       " c.`customerType`,c.`businessLicensePic`,c.`identityCardPic`,tm.`gzwtsUrl`,tm.`smwjUrl`" +
       " c.`customerType`,c.`businessLicensePic`,c.`identityCardPic`,tm.`gzwtsUrl`,tm.`smwjUrl`" +
       " FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
       " FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +