Merge remote-tracking branch 'origin/mark' into lcw

business/model/const.go

@@ -1,5 +1,11 @@
 package model
 
+import (
+	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
+	"git.rosy.net.cn/baseapi/platformapi/jdapi"
+	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
+)
+
 // VendorIDJD, VendorIDMTWM与VendorIDELM的定义和老系统是兼容的
 const (
 	VendorIDUnknown       = -1
@@ -42,6 +48,7 @@ var (
 		VendorIDYiLianYun: "Yilianyun",
 		VendorIDZhongWu:   "ZhongWu",
 	}
+
 	VendorChineseNames = map[int]string{
 		VendorIDJD:   "京东到家",
 		VendorIDMTWM: "美团外卖",
@@ -58,6 +65,21 @@ var (
 		VendorIDZhongWu:   "中午云",
 	}
 
+	PurchaseVendorInfo = map[int]map[string]interface{}{
+		VendorIDJD: map[string]interface{}{
+			"chineseName":               VendorChineseNames[VendorIDJD],
+			"userApplyCancelWaitMinute": jdapi.UserApplyCancelWaitMinute,
+		},
+		VendorIDMTWM: map[string]interface{}{
+			"chineseName":               VendorChineseNames[VendorIDMTWM],
+			"userApplyCancelWaitMinute": mtwmapi.UserApplyCancelWaitMinute,
+		},
+		VendorIDEBAI: map[string]interface{}{
+			"chineseName":               VendorChineseNames[VendorIDEBAI],
+			"userApplyCancelWaitMinute": ebaiapi.UserApplyCancelWaitMinute,
+		},
+	}
+
 	ShopChineseNames = map[int]string{
 		VendorIDJD:   "京西菜市",
 		VendorIDMTWM: "美好菜市",
@@ -215,7 +237,7 @@ const (
 	WaybillStatusEndBegin  = 100 // 以下的状态就是结束状态
 	WaybillStatusDelivered = 105 // todo 这个应该改为110，与订单对应
 	WaybillStatusCanceled  = 115
-	WaybillStatusFailed    = 120 // todo 这个应该要去掉
+	WaybillStatusFailed    = 120 // 这个状态存在的意义是区分于WaybillStatusCanceled，比如达达平台在这种状态下再次创建运单的方式不一样
 	WaybillStatusNeverSend = 125 // 这个状态指的是平台方不愿意配送，门店自己想办法。与WaybillStatusAcceptCanceled不一样，WaybillStatusAcceptCanceled可能之后还会尝试配送
 )
 
@@ -240,8 +262,20 @@ const (
 	OrderDeliveryFlagMaskScheduleDisabled = 1 // 禁止三方配送调度
 	OrderDeliveryFlagMaskPurcahseDisabled = 2 // 购物平台已不配送（一般为门店配送类型本身为自配送，或已经转自配送）
 )
+
 const (
 	OrderFlagMaskPrinted = 1 // 已经打印
+
+	OrderFlagMaskUserApplyCancel   = 6
+	OrderFlagAgreeUserApplyCancel  = 2
+	OrderFlagRefuseUserApplyCancel = 6
+
+	OrderFlagMaskFailedGetGoods   = 24
+	OrderFlagAgreeFailedGetGoods  = 8
+	OrderFlagRefuseFailedGetGoods = 24
+
+	OrderFlagMaskFailedDeliver = 32
+	OrderFlagMaskCallPMCourier = 64 // 取货失败后召唤平台配送
 )
 
 func IsPurchaseVendorExist(vendorID int) bool {

business/model/dao/dao.go

@@ -59,10 +59,6 @@ func GetDB() *DaoDB {
 	return &DaoDB{Db: orm.NewOrm()}
 }
 
-func WrapDB(ormDb orm.Ormer) *DaoDB {
-	return &DaoDB{Db: ormDb}
-}
-
 func Begin(db *DaoDB) (err error) {
 	if db.transactionLevel == 0 {
 		err = db.Db.Begin()

business/model/dao/dao_order.go

@@ -25,27 +25,29 @@ func GetStoreOrderAfterTime(db *DaoDB, storeID int, orderTime time.Time, lastOrd
 	return orderList, GetRows(db, &orderList, sql, sqlParams...)
 }
 
-func SetOrderPrintFlag(db *DaoDB, vendorOrderID string, vendorID int, isPrinted bool) (err error) {
-	var (
-		sql       string
-		sqlParams []interface{}
-	)
+func SetOrderPrintFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int, isPrinted bool) (err error) {
 	if isPrinted {
-		sql = `
-		UPDATE goods_order
-		SET flag = flag | ?
-		WHERE vendor_order_id = ? AND vendor_id = ?
-		`
-		sqlParams = append(sqlParams, model.OrderFlagMaskPrinted)
+		err = SetOrderFlag(db, userName, vendorOrderID, vendorID, model.OrderFlagMaskPrinted)
 	} else {
-		sql = `
-		UPDATE goods_order
-		SET flag = flag & ?
-		WHERE vendor_order_id = ? AND vendor_id = ?
-		`
-		sqlParams = append(sqlParams, ^model.OrderFlagMaskPrinted)
+		err = SetOrderFlag(db, userName, vendorOrderID, vendorID, ^int8(model.OrderFlagMaskPrinted))
 	}
-	sqlParams = append(sqlParams, vendorOrderID, vendorID)
-	_, err = ExecuteSQL(db, sql, sqlParams...)
+	return err
+}
+
+func SetOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int, flag int8) (err error) {
+	_, err = ExecuteSQL(db, `
+	UPDATE goods_order
+	SET flag = flag | ?
+	WHERE vendor_order_id = ? AND vendor_id = ?
+	`, flag, vendorOrderID, vendorID)
+	return err
+}
+
+func ClearOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID int, flag int8) (err error) {
+	_, err = ExecuteSQL(db, `
+	UPDATE goods_order
+	SET flag = flag & ?
+	WHERE vendor_order_id = ? AND vendor_id = ?
+	`, flag, vendorOrderID, vendorID)
 	return err
 }

business/model/order.go

@@ -32,7 +32,8 @@ type GoodsOrder struct {
 	Status                int       `json:"status"`     // 参见OrderStatus*相关的常量定义
 	VendorStatus          string    `orm:"size(255)" json:"-"`
 	LockStatus            int       `json:"lockStatus"`
-	OrderSeq              int       `json:"orderSeq"` // 门店订单序号
+	LockStatusTime        time.Time `orm:"type(datetime);null" json:"-"` // last lock status time
+	OrderSeq              int       `json:"orderSeq"`                    // 门店订单序号
 	BuyerComment          string    `orm:"size(255)" json:"buyerComment"`
 	BusinessType          int       `json:"businessType"`
 	ExpectedDeliveredTime time.Time `orm:"type(datetime)" json:"expectedDeliveredTime"` // 预期送达时间