Accept Merge Request #185: (su -> mark)

Merge Request: 分账修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/185

business/model/dao/store_sku.go

@@ -63,9 +63,9 @@ type StoreSkuSyncInfo struct {
 	BindDeletedAt  time.Time `orm:"type(datetime)" json:"bindDeletedAt"`
 
 	model.Sku
-	ExdSkuID   string `orm:"column(exd_sku_id)"`
-	ExdSkuName string
-	ExdUpc     int
+	ExdSkuID           string `orm:"column(exd_sku_id)"`
+	ExdCategoryThirdID int    `orm:"column(exd_category_third_id)"`
+	StoreName          string
 
 	// sku_name
 	Prefix        string
@@ -388,7 +388,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	t13.%s desc_img,
-	t4.%s_category_id vendor_vendor_cat_id`
+	t4.%s_category_id vendor_vendor_cat_id,
+	ts.name store_name`
 	fmtParams := []interface{}{
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
@@ -413,6 +414,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	sql += `
 	FROM store_sku_bind t1
 	JOIN store_map t14 ON t14.store_id = t1.store_id AND t14.vendor_id = ? AND t14.deleted_at = ?
+	LEFT JOIN store ts ON ts.id = t1.store_id AND ts.deleted_at = ?
 	LEFT JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?/* AND t2.status = ?*/
 	LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?/* AND t3.status = ?*/
 	LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
@@ -425,6 +427,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 		utils.DefaultTimeValue, // model.SkuStatusNormal,
 		utils.DefaultTimeValue, // model.SkuStatusNormal,
 		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
 	}
 	if globals.IsStoreSkuAct {
 		sql += `

business/model/sku.go

@@ -150,6 +150,9 @@ type SkuCategory struct {
 	// WscCategoryID int64 `orm:"column(wsc_category_id)" json:"wscCategoryID"` // 这个是指对应的美团外卖商品类别
 	Status int8   `orm:"default(1)" json:"status"` //分类状态，0表示禁用，1表示启用
 	Img    string `orm:"size(512)" json:"img"`     //分类图片
+
+	ExdName string `json:"exdName"` //饿鲜达对应分类名
+	ExdSeq  int    `json:"exdSeq"`
 	// JdID         int64  `orm:"column(jd_id);index" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
 	// JdSyncStatus int8   `orm:"default(2)" json:"jdSyncStatus"`
 }
@@ -223,6 +226,9 @@ type Sku struct {
 	Weight      int     `json:"weight"`                 // 重量/质量，单位为克，当相应的SkuName的SpecUnit为g或kg时，必须等于SpecQuality
 	Status      int     `json:"status"`
 	Seq         int     `json:"seq"`
+
+	ExdSkuID           string `orm:"column(exd_sku_id)" json:"exdSkuID"`
+	ExdCategoryThirdID int    `orm:"column(exd_category_third_id)" json:"exdCategoryThirdID"`
 	// JdID         int64   `orm:"column(jd_id);null;index" json:"jdID"`
 	// JdSyncStatus int8    `orm:"default(2)" json:"jdSyncStatus"`
 

business/model/store.go

@@ -55,6 +55,10 @@ const (
 	AutoReplyDisabled    = 2 // 禁止自动回复
 )
 
+const (
+	ExdStoreName = "饿鲜达"
+)
+
 var (
 	StoreStatusName = map[int]string{
 		StoreStatusDisabled: "禁用",

business/model/sync_map.go

@@ -5,6 +5,7 @@ const (
 	ThingTypeSkuName  = 2
 	ThingTypeSku      = 3
 	ThingTypeStore    = 4
+	ThingTypeUser     = 5
 )
 
 type ThingMap struct {

business/model/user.go

@@ -52,7 +52,9 @@ type User struct {
 
 	ParentMobile     string `orm:"size(32)" json:"parentMobile"`
 	DividePercentage int    `json:"dividePercentage"`
-	IsReceiver       int    `json:"isReceiver"`
+	Profit           int    `json:"profit"`
+	ProfitSum        int    `json:"profitSum"`
+	Arrears          int    `json:"arrears"`
 }
 
 func (*User) TableUnique() [][]string {