1

business/model/const.go

@@ -151,6 +151,7 @@ var (
 		VendorIDMTWM: 0,
 		VendorIDELM:  0,
 		VendorIDEBAI: 0,
+		VendorIDDD:   0,
 	}
 
 	ZXCityCodeMap = map[int]string{

business/model/dao/dao_order.go

@@ -1382,10 +1382,11 @@ func GetOrdersForJxPay(db *DaoDB, finishTimeBegin, finishTimeEnd time.Time) (goo
 }
 
 func GetWaybills(db *DaoDB, vendorOrderID string) (waybills []*model.Waybill, err error) {
-	sql := `SELECT * 
+	sql := `		SELECT * 
 			FROM waybill 
-			WHERE vendor_order_id = ?
+			WHERE vendor_order_id = ? ORDER BY waybill_created_at asc
 	`
+
 	sqlParams := []interface{}{vendorOrderID}
 	err = GetRows(db, &waybills, sql, sqlParams)
 	return waybills, err