1

business/jxcallback/orderman/orderman_ext.go

@@ -346,7 +346,7 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
 			}
 		}
 	}
-		//if isJxIncomeArea {
+	//if isJxIncomeArea {
 	//	begin = utils.MustInterface2Int64(params["jxIncomeBegin"])
 	//	end = utils.MustInterface2Int64(params["jxIncomeEnd"])
 	//	pageSize = math.MaxInt32
@@ -712,6 +712,31 @@ func (c *OrderManager) GetOrderStatusList(ctx *jxcontext.Context, vendorOrderID
 	return statusList, nil
 }
 
+// GetOrderStatusList2 查询订单流程 refVendorOrderID 订单Id
+func GetOrderStatusList2(refVendorOrderID string, wayBillId string, orderType int, vendorID int) (statusList []*model.OrderStatus, err error) {
+	sql := `
+	SELECT *
+	FROM order_status t1
+	WHERE t1.ref_vendor_order_id = ? AND t1.vendor_order_id = ? AND t1.vendor_id = ? 
+	`
+	sqlParams := []interface{}{
+		refVendorOrderID,
+		wayBillId,
+		vendorID,
+	}
+	if orderType > 0 {
+		sql += " AND t1.order_type = ?"
+		sqlParams = append(sqlParams, orderType)
+	}
+	sql += " ORDER BY t1.status_time, t1.order_type DESC, t1.status"
+
+	db := dao.GetDB()
+	if err = dao.GetRows(db, &statusList, sql, sqlParams...); err != nil {
+		return nil, err
+	}
+	return statusList, nil
+}
+
 func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
 	globals.SugarLogger.Debugf("GetOrdersFinancial from:%s to:%s", fromDateStr, toDateStr)
 	pageSize = jxutils.FormalizePageSize(pageSize)