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

business/model/const.go

@@ -267,6 +267,8 @@ const (
 	OrderFlagMaskFailedDeliver = 32
 	OrderFlagMaskCallPMCourier = 64  // 取货失败后召唤平台配送
 	OrderFlagMaskSetDelivered  = 128 // 设置送达
+
+	OrderFlagMaskFake = 256 // 假订单，即刷单用的
 )
 
 const (
@@ -338,6 +340,10 @@ func IsOrderImportantStatus(status int) bool {
 	return IsOrderMainStatus(status) || IsOrderLockStatus(status) || IsOrderUnlockStatus(status)
 }
 
+func IsSpecialVendorID(vendorID int) bool {
+	return vendorID == VendorIDWSC || vendorID == VendorIDJX
+}
+
 func WaybillVendorID2Mask(vendorID int) (mask int8) {
 	if vendorID == VendorIDDada {
 		mask = OrderDeliveryFlagMaskDada

business/model/dao/dao_auth2.go

@@ -56,7 +56,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri
 		sql += " AND t1.auth_id2 = ?"
 		sqlParams = append(sqlParams, authID2)
 	}
-
+	sql += " ORDER BY t1.type"
 	err = GetRows(db, &authList, sql, sqlParams...)
 	return authList, err
 }

business/model/dao/store.go

@@ -399,10 +399,10 @@ func GetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model.Sto
 
 func FakeGetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model.StoreMap, err error) {
 	vendorID2 := vendorID
-	if vendorID == model.VendorIDWSC {
-		vendorID2 = model.VendorIDJD // 微商城的属性以京东属性为准（以免再绑定）
+	if model.IsSpecialVendorID(vendorID) {
+		vendorID2 = model.VendorIDJD // 微商城与京西的属性以京东属性为准（以免再绑定）
 	}
-	if storeMap, err = GetStoreMapByStoreID(db, storeID, vendorID2); vendorID == model.VendorIDWSC && IsNoRowsError(err) {
+	if storeMap, err = GetStoreMapByStoreID(db, storeID, vendorID2); model.IsSpecialVendorID(vendorID) && IsNoRowsError(err) {
 		err = nil
 		storeMap = &model.StoreMap{
 			StoreID:         storeID,
@@ -416,6 +416,9 @@ func FakeGetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model
 			IsSync:              1,
 		}
 	}
+	if storeMap != nil && vendorID == model.VendorIDJX {
+		storeMap.DeliveryType = model.StoreDeliveryTypeByStore
+	}
 	return storeMap, err
 }
 

business/model/net_spider.go

@@ -23,6 +23,9 @@ type PageShop struct {
 	RecentOrderNum int     `orm:"size(48)" json:"recentOrderNum"`         // 月订单量
 	SkuCount       int     `orm:"size(48)" json:"skuCount"`               // 商品总量
 	BusinessType   string  `orm:"size(48)" json:"businessType"`           // 经营范围
+
+	LicenceCode string `orm:"size(32)" json:"licenceCode"` // 营业执照
+	LicenceImg  string `orm:"size(255)" json:"licenceImg"` // 营业执照图片
 }
 
 func (*PageShop) TableUnique() [][]string {

business/model/new_config.go

@@ -7,6 +7,10 @@ const (
 	ConfigTypeRole      = "Role"
 )
 
+const (
+	ConfigSysFakeOrderMobiles = "FakeOrderMobiles" // 假订单手机
+)
+
 var (
 	ConfigTypeName = map[string]string{
 		ConfigTypeSys:       "系统",