Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

business/model/const.go

@@ -86,6 +86,18 @@ var (
 		OrderTypeAfsOrder: "售后单",
 	}
 
+	ComplaintReasons = map[int]string{
+		ComplaintReasons1:  "骑手态度恶劣",
+		ComplaintReasons2:  "骑手接单后未取货",
+		ComplaintReasons3:  "骑手取货太慢",
+		ComplaintReasons4:  "骑手送货太慢",
+		ComplaintReasons5:  "货品未送达",
+		ComplaintReasons6:  "货品有损坏",
+		ComplaintReasons7:  "骑手违规收取顾客其他费用",
+		ComplaintReasons69: "骑手恶意取消订单",
+		ComplaintReasons71: "骑手提前点击取货/送达",
+	}
+
 	MultiStoresVendorMap = map[int]int{
 		VendorIDJD:   1,
 		VendorIDMTWM: 0,
@@ -204,6 +216,19 @@ const (
 	LockStatusLocked   = 1
 )
 
+//投诉原因
+const (
+	ComplaintReasons1  = 1  //"骑手态度恶劣",
+	ComplaintReasons2  = 2  //"骑手接单后未取货"
+	ComplaintReasons3  = 3  //"骑手取货太慢",
+	ComplaintReasons4  = 4  //"骑手送货太慢",
+	ComplaintReasons5  = 5  //"货品未送达",
+	ComplaintReasons6  = 6  //"货品有损坏",
+	ComplaintReasons7  = 7  //"骑手违规收取顾客其他费用",
+	ComplaintReasons69 = 69 //"骑手恶意取消订单",
+	ComplaintReasons71 = 71 //"骑手提前点击取货/送达",
+)
+
 const (
 	WaybillStatusRefuseFailedGetGoods = -70
 	WaybillStatusUnknown              = 0

business/model/dao/dao_order.go

@@ -1032,7 +1032,7 @@ func GetWayBillByOrderID(db *DaoDB, orderStatus, vendorID, waybillVendorID int,
 	sql := `
 		SELECT b.*
 		FROM goods_order a 
-		JOIN waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id AND b.vendor_id = a.vendor_id
+		JOIN waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id AND b.order_vendor_id = a.vendor_id
 		WHERE a.vendor_order_id = ?
 		AND a.vendor_id = ?
 	`
@@ -1051,3 +1051,52 @@ func GetWayBillByOrderID(db *DaoDB, orderStatus, vendorID, waybillVendorID int,
 	err = GetRows(db, &wayBillList, sql, sqlParams...)
 	return wayBillList, err
 }
+
+func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs []int, vendorOrderID string, fromTime, toTime time.Time, status, stype, offset, pageSize int) (orderSupplementFee []*model.OrderSupplementFee, totalCount int, err error) {
+	sql := `
+		SELECT SQL_CALC_FOUND_ROWS * 
+		FROM order_supplement_fee
+		WHERE 1=1
+		AND deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if !utils.IsTimeZero(fromTime) {
+		sql += " AND supplement_time >= ?"
+		sqlParams = append(sqlParams, fromTime)
+	}
+	if !utils.IsTimeZero(toTime) {
+		sql += " AND supplement_time <= ?"
+		sqlParams = append(sqlParams, toTime)
+	}
+	if len(storIDs) > 0 {
+		sql += " AND store_id IN (" + GenQuestionMarks(len(storIDs)) + ")"
+		sqlParams = append(sqlParams, storIDs)
+	}
+	if len(vendorIDs) > 0 {
+		sql += " AND store_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
+		sqlParams = append(sqlParams, vendorIDs)
+	}
+	if vendorOrderID != "" {
+		sql += " AND vendor_order_id = ?"
+		sqlParams = append(sqlParams, vendorOrderID)
+	}
+	if status >= 0 {
+		sql += " AND status = ?"
+		sqlParams = append(sqlParams, status)
+	}
+	if stype >= 0 {
+		sql += " AND type = ?"
+		sqlParams = append(sqlParams, stype)
+	}
+	sql += `
+		LIMIT ? OFFSET ?`
+	sqlParams = append(sqlParams, pageSize, offset)
+	Begin(db)
+	defer Commit(db)
+	if err = GetRows(db, &orderSupplementFee, sql, sqlParams...); err == nil {
+		totalCount = GetLastTotalRowCount(db)
+	}
+	return orderSupplementFee, totalCount, err
+}

business/model/order.go

@@ -344,6 +344,11 @@ type OrderPayRefund struct {
 	OriginalData string `orm:"type(text)" json:"-"`
 }
 
+type OrderSupplementFee struct {
+	ModelIDCULD
+	VendorOrderID string `orm:"column(vendor_order_id);index;size(48)" json:"vendorOrderID"`
+}
+
 // 判断是否是购买平台自有物流
 // 对于京东，饿百来说，就是其自有的物流，对于微商城来说，是达达
 func IsWaybillPlatformOwn(bill *Waybill) bool {