京东物流超重验证

business/model/bill.go

@@ -11,6 +11,8 @@ const (
 
 	BillTypeQuitGroup = 30 //退群
 
+	BillTypeJdWaybillOverWeight = 40 //京东物流超重扣款
+
 	BillTypeCash   = 8 //提现
 	BillTypeInvest = 6 //充值
 )

business/model/dao/dao_order.go

@@ -9,7 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
-func GetDeliveryOrdersNoPage(db *DaoDB, userIDs []string, statuss []int, fromTime, toTime time.Time) (dOrders []*model.DeliveryOrder, err error) {
+func GetDeliveryOrdersNoPage(db *DaoDB, userIDs []string, statuss []int, fromTime, toTime time.Time, isWeights []int) (dOrders []*model.DeliveryOrder, err error) {
 	sql := `
 		SELECT *
 		  FROM delivery_order
@@ -24,6 +24,10 @@ func GetDeliveryOrdersNoPage(db *DaoDB, userIDs []string, statuss []int, fromTim
 		sql += ` AND a.status IN (` + GenQuestionMarks(len(statuss)) + `)`
 		sqlParams = append(sqlParams, statuss)
 	}
+	if len(isWeights) > 0 {
+		sql += ` AND a.is_weight IN (` + GenQuestionMarks(len(isWeights)) + `)`
+		sqlParams = append(sqlParams, isWeights)
+	}
 	if fromTime != utils.ZeroTimeValue {
 		sql += ` AND a.created_at >= ?`
 		sqlParams = append(sqlParams, fromTime)

business/model/order.go

@@ -2,12 +2,6 @@ package model
 
 import "time"
 
-const (
-	OrderDeliveryTypePlatform  = "platform" // 平台负责配送
-	OrderDeliveryTypeStoreSelf = "store"    // 门店自送
-	OrderDeliveryTypeSelfTake  = "self"     // 用户自提
-)
-
 const (
 	PayTypeWX = 1 // 微信支付
 	PayTypeTL = 2 // 通联宝支付
@@ -22,9 +16,6 @@ const (
 	RefundStatusYes    = 1
 	RefundStatusFailed = 2
 
-	EarningTypeQuote  = 1 //报价模式
-	EarningTypePoints = 2 //扣点模式
-
 	VendorPayTypeCompanyPay = "companyPay" //企业付款
 )