1

business/model/api_config.go

@@ -30,6 +30,7 @@ const (
 	VendorIDDada          = 101 // 达达配送
 	VendorIDMTPS          = 102 // 美团配送
 	VendorIDFengNiao      = 103 // 蜂鸟配送
+	VendorJXFakeWL        = 300 // 京西假物流
 	VendorIDJDWL          = 401 //京东物流
 	VendorIDDeliveryEnd   = 500
 

business/model/dao/dao_order.go

@@ -1392,17 +1392,30 @@ func GetWaybills(db *DaoDB, vendorOrderID string) (waybills []*model.Waybill, er
 	return waybills, err
 }
 
-// GetWayBillsByWayBillId 根据运单id获取运单id
+// GetWayBillsByWayBillId 根据运单id获取运单id(专用于抖店查询,抖店返回的运单id实际就是订单id,本地存放的运单id为真实id)
 func GetWayBillsByWayBillId(db *DaoDB, vendorWayBillId string) (waybills []*model.Waybill, err error) {
 	sql := `SELECT * 
 			FROM waybill 
-			WHERE vendor_waybill_id = ?
+			WHERE vendor_order_id = ? ORDER BY created_at desc
 	`
 	sqlParams := []interface{}{vendorWayBillId}
 	err = GetRows(db, &waybills, sql, sqlParams)
 	return waybills, err
 }
 
+// GetWayBillFakeOrder 获取当前系统未完成的假订单
+func GetWayBillFakeOrder() (waybills []*model.Waybill, err error) {
+	sql := `
+			SELECT * 
+			FROM waybill 
+			WHERE waybill_vendor_id = ? AND status < ? AND waybill_created_at>= ? AND waybill_created_at< ? 
+	`
+
+	sqlParams := []interface{}{model.VendorJXFakeWL, model.WaybillStatusFailed, time.Now().Add(-7 * 24 * time.Hour), time.Now()}
+	err = GetRows(GetDB(), &waybills, sql, sqlParams)
+	return waybills, err
+}
+
 func GetMatterChildOrders(db *DaoDB, vendorOrderID string) (goods []*model.GoodsOrder, err error) {
 	sql := `SELECT * 
 			FROM goods_order