queryVOrderByOrderStatusAndItemCode add , updateOrderStatusById add

center-order/app/base/api/impl/action/order.js

@@ -49,6 +49,12 @@ class OrderAPI extends APIBase {
             case "delOrder"://删除订单
                 opResult = await this.orderinfoSve.delOrder(pobj, pobj.actionBody);
                 break;
+            case "queryVOrderByOrderStatusAndItemCode":// 2020 0918 lin 新增 根据OrderStatus查询订单
+                opResult = await this.orderinfoSve.queryVOrderByOrderStatusAndItemCode(pobj, pobj.actionBody);
+                break;
+            case "updateOrderStatusById":// 2020 0923 lin 新增 根据id修改orderStatus，目前用来商标交易更新订单状态
+                opResult = await this.orderinfoSve.updateOrderStatusById(pobj, pobj.actionBody);
+                break;
             case "channeldelOrder"://阿里工商注册退款
                 opResult = await this.orderinfoSve.channeldelOrder(pobj, pobj.actionBody);
                 break;

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

@@ -964,6 +964,40 @@ class OrderInfoService extends ServiceBase {
     await this.dao.delOrderByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id, pobj.userInfo.channel_userid);
     return system.getResultSuccess();
   }
+  // 2020 0918 lin 新增 根据OrderStatus查询订单
+  async queryVOrderByOrderStatusAndItemCode(pobj, actionBody) {
+    var sql = "select `id`,`isSolution`,`orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
+      + " `invoiceApplyStatus`,`opNotes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,created_at from v_order "
+      + " where v_order.uapp_id=:uapp_id";
+    var paramWhere = {};
+    paramWhere.uapp_id = pobj.appInfo.uapp_id;  
+    if (actionBody.orderStatus) {
+      sql += " and orderStatus=:orderStatus";
+      paramWhere.orderStatus = actionBody.orderStatus;
+    }
+    if (actionBody.itemCode) {
+      sql += " and itemCode=:itemCode";
+      paramWhere.itemCode = actionBody.itemCode;
+    }
+    var orderInfo = await this.customQuery(sql, paramWhere);
+    // var orderInfo = await this.dao.model.findAll({
+    //   where:{
+    //     uapp_id: pobj.appInfo.uapp_id,
+    //     orderStatus: actionBody.orderStatus,
+    //     itemCode: actionBody.itemCode
+    //   }
+    // });
+    return system.getResultSuccess(orderInfo);
+  }
+
+  // 2020 0923 lin 新增 根据id修改orderStatus，目前用来商标交易更新订单状态
+  async updateOrderStatusById(pobj, actionBody) {
+    var orderInfo = await this.dao.model.update({orderStatus:actionBody.orderStatus},{ where: { id: actionBody.orderId } })
+    if (!orderInfo) {
+      return system.getResult(null, "修改失败");
+    }
+    return system.getResultSuccess(orderInfo);
+  }
   //=================================修改订单信息==============end======================================