- skuName place bind man.
This commit is contained in:
@@ -15,6 +15,9 @@ type SkuNameExt struct {
|
|||||||
model.SkuName
|
model.SkuName
|
||||||
Skus []*model.Sku `orm:"-" json:"skus"`
|
Skus []*model.Sku `orm:"-" json:"skus"`
|
||||||
SkusStr string `orm:"size(2000)" json:"-"`
|
SkusStr string `orm:"size(2000)" json:"-"`
|
||||||
|
|
||||||
|
Places []*model.SkuNamePlaceBind `orm:"-" json:"places"`
|
||||||
|
PlacesStr string `orm:"size(2000)" json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type SkuNamesInfo struct {
|
type SkuNamesInfo struct {
|
||||||
@@ -125,7 +128,7 @@ func DeleteCategory(categoryID int, isForce bool, userName string) (num int64, e
|
|||||||
} else if countInfos[2].Ct != 0 {
|
} else if countInfos[2].Ct != 0 {
|
||||||
return 0, errors.New("还有商品类别使用此类别,不能删除")
|
return 0, errors.New("还有商品类别使用此类别,不能删除")
|
||||||
}
|
}
|
||||||
if num, err = dao.DeleteEntity(db, cat, nil, userName, utils.Params2Map(model.FieldJdSyncStatus, model.SyncFlagDeletedMask)); err == nil && num == 1 {
|
if num, err = dao.DeleteEntityLogically(db, cat, nil, userName, utils.Params2Map(model.FieldJdSyncStatus, model.SyncFlagDeletedMask)); err == nil && num == 1 {
|
||||||
err = CurVendorSync.SyncCategory(db, cat.ID, false, userName)
|
err = CurVendorSync.SyncCategory(db, cat.ID, false, userName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -136,6 +139,7 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
|
|||||||
sql := `
|
sql := `
|
||||||
FROM sku_name t1
|
FROM sku_name t1
|
||||||
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00'
|
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00'
|
||||||
|
LEFT JOIN sku_name_place_bind t3 ON t1.id = t3.name_id
|
||||||
WHERE t1.deleted_at = '1970-01-01 00:00:00'`
|
WHERE t1.deleted_at = '1970-01-01 00:00:00'`
|
||||||
sqlParams := make([]interface{}, 0)
|
sqlParams := make([]interface{}, 0)
|
||||||
if keyword != "" {
|
if keyword != "" {
|
||||||
@@ -181,7 +185,7 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
|
|||||||
sql += " AND ( 1 = 0"
|
sql += " AND ( 1 = 0"
|
||||||
}
|
}
|
||||||
if params["placeCode"] != nil {
|
if params["placeCode"] != nil {
|
||||||
sql += " " + placeCond + " (SELECT COUNT(*) FROM sku_name_place_bind bind WHERE bind.sku_name_id = t1.id AND bind.place_code = ?) > 0"
|
sql += " " + placeCond + " t3.place_code = ?"
|
||||||
sqlParams = append(sqlParams, params["placeCode"].(int))
|
sqlParams = append(sqlParams, params["placeCode"].(int))
|
||||||
}
|
}
|
||||||
if params["isGlobal"] != nil {
|
if params["isGlobal"] != nil {
|
||||||
@@ -240,7 +244,8 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
|
|||||||
t1.price,
|
t1.price,
|
||||||
t1.img,
|
t1.img,
|
||||||
t1.elm_img_hash_code,
|
t1.elm_img_hash_code,
|
||||||
CONCAT("[", GROUP_CONCAT(CONCAT('{"id":', t2.id, ',"status":', t2.status, ',"createdAt":"', CONCAT(REPLACE(t2.created_at," ","T"),"+08:00"), '","updatedAt":"', CONCAT(REPLACE(t2.updated_at," ","T"),"+08:00"), '","lastOperator":"', t2.last_operator, '","specQuality":', t2.spec_quality, ',"specUnit":"', t2.spec_unit, '","weight":', t2.weight, ',"jdID":', t2.jd_id, ',"categoryID":', t2.category_id, ',"nameID":', t2.name_id, "}")), "]") skus_str
|
CONCAT("[", GROUP_CONCAT(DISTINCT CONCAT('{"id":', t2.id, ',"status":', t2.status, ',"createdAt":"', CONCAT(REPLACE(t2.created_at," ","T"),"+08:00"), '","updatedAt":"', CONCAT(REPLACE(t2.updated_at," ","T"),"+08:00"), '","lastOperator":"', t2.last_operator, '","specQuality":', t2.spec_quality, ',"specUnit":"', t2.spec_unit, '","weight":', t2.weight, ',"jdID":', t2.jd_id, ',"categoryID":', t2.category_id, ',"nameID":', t2.name_id, "}")), "]") skus_str,
|
||||||
|
CONCAT("[", GROUP_CONCAT(DISTINCT CONCAT('{"id":', t3.id, ',"createdAt":"', CONCAT(REPLACE(t3.created_at," ","T"),"+08:00"), '","updatedAt":"', CONCAT(REPLACE(t3.updated_at," ","T"),"+08:00"), '","lastOperator":"', t3.last_operator, '","nameID":', t3.name_id, ',"placeCode":', t3.place_code, "}")), "]") places_str
|
||||||
` + sql + `
|
` + sql + `
|
||||||
ORDER BY t1.id
|
ORDER BY t1.id
|
||||||
LIMIT ? OFFSET ?`
|
LIMIT ? OFFSET ?`
|
||||||
@@ -263,6 +268,11 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if skuName.PlacesStr != "" {
|
||||||
|
if err = utils.UnmarshalUseNumber([]byte(skuName.PlacesStr), &skuName.Places); err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -289,6 +299,14 @@ func AddSkuName(skuNameExt *SkuNameExt, userName string) (outSkuNameExt *SkuName
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for _, placeBind := range skuNameExt.Places {
|
||||||
|
dao.WrapAddIDCULEntity(placeBind, userName)
|
||||||
|
placeBind.NameID = skuNameExt.ID
|
||||||
|
if err = dao.CreateEntity(db, placeBind); err != nil {
|
||||||
|
dao.Rollback(db)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
dao.Commit(db)
|
dao.Commit(db)
|
||||||
tmpInfo, err := GetSkuNames("", utils.Params2Map("id", skuNameExt.SkuName.ID), 0, 1)
|
tmpInfo, err := GetSkuNames("", utils.Params2Map("id", skuNameExt.SkuName.ID), 0, 1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -326,7 +344,7 @@ func DeleteSkuName(nameID int, userName string) (num int64, err error) {
|
|||||||
dao.Begin(db)
|
dao.Begin(db)
|
||||||
skuName := &model.SkuName{}
|
skuName := &model.SkuName{}
|
||||||
skuName.ID = nameID
|
skuName.ID = nameID
|
||||||
if num, err = dao.DeleteEntity(db, skuName, nil, userName, nil); err == nil && num == 1 {
|
if num, err = dao.DeleteEntityLogically(db, skuName, nil, userName, nil); err == nil && num == 1 {
|
||||||
dummy := &model.Sku{}
|
dummy := &model.Sku{}
|
||||||
num2, err2 := dao.UpdateEntityByKV(db, dummy, map[string]interface{}{
|
num2, err2 := dao.UpdateEntityByKV(db, dummy, map[string]interface{}{
|
||||||
model.FieldDeletedAt: time.Now(),
|
model.FieldDeletedAt: time.Now(),
|
||||||
@@ -387,7 +405,7 @@ func DeleteSku(skuID int, userName string) (num int64, err error) {
|
|||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
sku := &model.Sku{}
|
sku := &model.Sku{}
|
||||||
sku.ID = skuID
|
sku.ID = skuID
|
||||||
if num, err = dao.DeleteEntity(db, sku, nil, userName, nil); err == nil {
|
if num, err = dao.DeleteEntityLogically(db, sku, nil, userName, nil); err == nil {
|
||||||
if num == 1 {
|
if num == 1 {
|
||||||
err = CurVendorSync.SyncSku(db, -1, sku.ID, false, userName)
|
err = CurVendorSync.SyncSku(db, -1, sku.ID, false, userName)
|
||||||
} else {
|
} else {
|
||||||
@@ -396,3 +414,31 @@ func DeleteSku(skuID int, userName string) (num int64, err error) {
|
|||||||
}
|
}
|
||||||
return num, err
|
return num, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func AddSkuNamePlace(nameID, placeCode int, userName string) (outPlaceBind *model.SkuNamePlaceBind, err error) {
|
||||||
|
db := dao.GetDB()
|
||||||
|
placeBind := &model.SkuNamePlaceBind{
|
||||||
|
NameID: nameID,
|
||||||
|
PlaceCode: placeCode,
|
||||||
|
}
|
||||||
|
dao.WrapAddIDCULEntity(placeBind, userName)
|
||||||
|
if err = dao.CreateEntity(db, placeBind); err == nil {
|
||||||
|
err = CurVendorSync.SyncSku(db, nameID, -1, false, userName)
|
||||||
|
}
|
||||||
|
return placeBind, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeleteSkuNamePlace(nameID, placeCode int, userName string) (num int64, err error) {
|
||||||
|
db := dao.GetDB()
|
||||||
|
placeBind := &model.SkuNamePlaceBind{}
|
||||||
|
placeBind.NameID = nameID
|
||||||
|
placeBind.PlaceCode = placeCode
|
||||||
|
if num, err = dao.DeleteEntity(db, placeBind, model.FieldNameID, model.FieldPlaceCode); err == nil {
|
||||||
|
if num == 1 {
|
||||||
|
err = CurVendorSync.SyncSku(db, nameID, -1, false, userName)
|
||||||
|
} else {
|
||||||
|
err = ErrEntityNotExist
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return num, err
|
||||||
|
}
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ func GetStores(keyword string, params map[string]interface{}, offset, pageSize i
|
|||||||
|
|
||||||
if params["storeID"] != nil {
|
if params["storeID"] != nil {
|
||||||
sqlWhere += " AND t1.id = ?"
|
sqlWhere += " AND t1.id = ?"
|
||||||
sqlParams = append(sqlParams, params["storeID"].(int))
|
sqlParams = append(sqlParams, params["id"].(int))
|
||||||
}
|
}
|
||||||
if params["name"] != nil {
|
if params["name"] != nil {
|
||||||
sqlWhere += " AND t1.name LIKE ?"
|
sqlWhere += " AND t1.name LIKE ?"
|
||||||
@@ -266,8 +266,11 @@ func AddStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, storeMap *model.Sto
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DeleteStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, userName string) (num int64, err error) {
|
func DeleteStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, userName string) (num int64, err error) {
|
||||||
storeMap := &model.StoreMap{}
|
storeMap := &model.StoreMap{
|
||||||
return dao.DeleteEntity(db, storeMap, utils.Params2Map(model.FieldStoreID, storeID, model.FieldVendorID, vendorID), "", nil)
|
StoreID: storeID,
|
||||||
|
VendorID: vendorID,
|
||||||
|
}
|
||||||
|
return dao.DeleteEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, payload map[string]interface{}, userName string) (num int64, err error) {
|
func UpdateStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, payload map[string]interface{}, userName string) (num int64, err error) {
|
||||||
|
|||||||
@@ -48,13 +48,13 @@ func Init(objCreator func(objHint string) interface{}, interfaceTypes ...interfa
|
|||||||
func (m *DurableTaskMan) LoadPendingTask() (err error) {
|
func (m *DurableTaskMan) LoadPendingTask() (err error) {
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
tasks := make([]*model.DurableTask, 0)
|
tasks := make([]*model.DurableTask, 0)
|
||||||
if err = dao.GetRows(db, &tasks, "SELECT * FROM durable_task WHERE status = 0"); err == nil {
|
if err = dao.GetEntities(db, &tasks, utils.Params2Map(model.FieldStatus, 0), true); err == nil {
|
||||||
for _, task := range tasks {
|
for _, task := range tasks {
|
||||||
dTask := &DurableTask{
|
dTask := &DurableTask{
|
||||||
data: task,
|
data: task,
|
||||||
}
|
}
|
||||||
m.tasks[task.TaskID] = dTask
|
m.tasks[task.TaskID] = dTask
|
||||||
return dao.GetRows(db, &dTask.items, "SELECT * FROM durable_task_item WHERE status = 0")
|
return dao.GetEntities(db, &dTask.items, utils.Params2Map(model.FieldStatus, 0), true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -180,8 +180,18 @@ func CreateEntity(db *DaoDB, item interface{}) (err error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果logicDeletedBy不为空,表示逻辑删除,否则物理删除
|
func DeleteEntity(db *DaoDB, item interface{}, cols ...string) (num int64, err error) {
|
||||||
func DeleteEntity(db *DaoDB, item interface{}, conditions map[string]interface{}, logicDeletedBy string, kvs map[string]interface{}) (num int64, err error) {
|
if db == nil {
|
||||||
|
db = GetDB()
|
||||||
|
}
|
||||||
|
err = utils.CallFuncLogError(func() error {
|
||||||
|
num, err = db.db.Delete(item, cols...)
|
||||||
|
return err
|
||||||
|
}, reflect.TypeOf(item).Name())
|
||||||
|
return num, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeleteEntityLogically(db *DaoDB, item interface{}, conditions map[string]interface{}, logicDeletedBy string, kvs map[string]interface{}) (num int64, err error) {
|
||||||
if db == nil {
|
if db == nil {
|
||||||
db = GetDB()
|
db = GetDB()
|
||||||
}
|
}
|
||||||
@@ -194,17 +204,13 @@ func DeleteEntity(db *DaoDB, item interface{}, conditions map[string]interface{}
|
|||||||
qs = qs.Filter(k, v)
|
qs = qs.Filter(k, v)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if logicDeletedBy != "" {
|
qs = qs.Filter(model.FieldDeletedAt, utils.DefaultTimeValue)
|
||||||
qs = qs.Filter(model.FieldDeletedAt, utils.DefaultTimeValue)
|
updateValues := map[string]interface{}{
|
||||||
updateValues := map[string]interface{}{
|
model.FieldDeletedAt: time.Now(),
|
||||||
model.FieldDeletedAt: time.Now(),
|
model.FieldUpdatedAt: time.Now(),
|
||||||
model.FieldUpdatedAt: time.Now(),
|
model.FieldLastOperator: logicDeletedBy,
|
||||||
model.FieldLastOperator: logicDeletedBy,
|
|
||||||
}
|
|
||||||
num, err = qs.Update(utils.MergeMaps(updateValues, kvs))
|
|
||||||
} else {
|
|
||||||
num, err = qs.Delete()
|
|
||||||
}
|
}
|
||||||
|
num, err = qs.Update(utils.MergeMaps(updateValues, kvs))
|
||||||
return err
|
return err
|
||||||
}, reflect.TypeOf(item).Name())
|
}, reflect.TypeOf(item).Name())
|
||||||
return num, err
|
return num, err
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ func TestSelectEntities(t *testing.T) {
|
|||||||
FROM sku_name_place_bind t1
|
FROM sku_name_place_bind t1
|
||||||
JOIN place t2 ON t1.place_code = t2.code
|
JOIN place t2 ON t1.place_code = t2.code
|
||||||
JOIN place t3 ON (t2.level = 2 AND t2.code = t3.code) OR (t2.level = 1 AND t2.code = t3.parent_code)
|
JOIN place t3 ON (t2.level = 2 AND t2.code = t3.code) OR (t2.level = 1 AND t2.code = t3.parent_code)
|
||||||
WHERE t1.sku_name_id = ?
|
WHERE t1.name_id = ?
|
||||||
`, 40)
|
`, 40)
|
||||||
|
|
||||||
globals.SugarLogger.Debug(utils.Format4Output(places, false))
|
globals.SugarLogger.Debug(utils.Format4Output(places, false))
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ func GetPlaceByCode(db *DaoDB, code int) (place *model.Place, err error) {
|
|||||||
place = &model.Place{
|
place = &model.Place{
|
||||||
Code: code,
|
Code: code,
|
||||||
}
|
}
|
||||||
err = db.db.Read(place, "Code")
|
err = GetEntity(db, place, "Code")
|
||||||
return place, err
|
return place, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@ func GetPlaceByName(db *DaoDB, name string, level int, parentCode int) (place *m
|
|||||||
Level: int8(level),
|
Level: int8(level),
|
||||||
ParentCode: parentCode,
|
ParentCode: parentCode,
|
||||||
}
|
}
|
||||||
if err = db.db.Read(place, "Name", "Level", "ParentCode"); err == orm.ErrNoRows {
|
if err = GetEntity(db, place, "Name", "Level", "ParentCode"); err == orm.ErrNoRows {
|
||||||
err = db.db.Raw("SELECT * FROM place WHERE parent_code = ? AND level = ? AND name LIKE ?", parentCode, level, "%"+name+"%").QueryRow(place)
|
err = db.db.Raw("SELECT * FROM place WHERE parent_code = ? AND level = ? AND name LIKE ?", parentCode, level, "%"+name+"%").QueryRow(place)
|
||||||
}
|
}
|
||||||
return place, err
|
return place, err
|
||||||
|
|||||||
@@ -4,17 +4,17 @@ import (
|
|||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetSellCities(db *DaoDB, skuNameID int, vendorID int) (cities []*model.Place, err error) {
|
func GetSellCities(db *DaoDB, nameID int, vendorID int) (cities []*model.Place, err error) {
|
||||||
cities = []*model.Place{}
|
cities = []*model.Place{}
|
||||||
sql := `
|
sql := `
|
||||||
SELECT DISTINCT t3.*
|
SELECT DISTINCT t3.*
|
||||||
FROM sku_name_place_bind t1
|
FROM sku_name_place_bind t1
|
||||||
JOIN place t2 ON t1.place_code = t2.code
|
JOIN place t2 ON t1.place_code = t2.code
|
||||||
JOIN place t3 ON (t2.level = 2 AND t2.code = t3.code) OR (t2.level = 1 AND t2.code = t3.parent_code)
|
JOIN place t3 ON (t2.level = 2 AND t2.code = t3.code) OR (t2.level = 1 AND t2.code = t3.parent_code)
|
||||||
WHERE t1.sku_name_id = ?
|
WHERE t1.name_id = ?
|
||||||
`
|
`
|
||||||
if vendorID == model.VendorIDJD {
|
if vendorID == model.VendorIDJD {
|
||||||
sql += "AND t3.jd_code <> 0\n"
|
sql += "AND t3.jd_code <> 0\n"
|
||||||
}
|
}
|
||||||
return cities, GetRows(db, &cities, sql, skuNameID)
|
return cities, GetRows(db, &cities, sql, nameID)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ const (
|
|||||||
FieldCreatedAt = "CreatedAt"
|
FieldCreatedAt = "CreatedAt"
|
||||||
FieldUpdatedAt = "UpdatedAt"
|
FieldUpdatedAt = "UpdatedAt"
|
||||||
FieldLastOperator = "LastOperator"
|
FieldLastOperator = "LastOperator"
|
||||||
|
FieldStatus = "Status"
|
||||||
FieldSyncStatus = "SyncStatus"
|
FieldSyncStatus = "SyncStatus"
|
||||||
FieldJdSyncStatus = "JdSyncStatus"
|
FieldJdSyncStatus = "JdSyncStatus"
|
||||||
|
|
||||||
@@ -18,6 +19,7 @@ const (
|
|||||||
FieldStoreID = "StoreID"
|
FieldStoreID = "StoreID"
|
||||||
FieldVendorStoreID = "VendorStoreID"
|
FieldVendorStoreID = "VendorStoreID"
|
||||||
FieldNameID = "NameID"
|
FieldNameID = "NameID"
|
||||||
|
FieldPlaceCode = "PlaceCode"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ModelIDCUL struct {
|
type ModelIDCUL struct {
|
||||||
|
|||||||
@@ -102,13 +102,14 @@ type SkuCategory struct {
|
|||||||
ElmCategoryID int64 `orm:"column(elm_category_id)" json:"elmCategoryID"` // 这个是指对应的饿了么商品类别
|
ElmCategoryID int64 `orm:"column(elm_category_id)" json:"elmCategoryID"` // 这个是指对应的饿了么商品类别
|
||||||
EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别
|
EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别
|
||||||
|
|
||||||
JdID int64 `orm:"column(jd_id);index" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
|
JdID int64 `orm:"column(jd_id)" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
|
||||||
JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"`
|
JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (*SkuCategory) TableUnique() [][]string {
|
func (*SkuCategory) TableUnique() [][]string {
|
||||||
return [][]string{
|
return [][]string{
|
||||||
[]string{"Name", "DeletedAt"},
|
[]string{"Name", "DeletedAt"},
|
||||||
|
[]string{"JdID", "DeletedAt"},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,11 +117,11 @@ type SkuName struct {
|
|||||||
ModelIDCULD
|
ModelIDCULD
|
||||||
|
|
||||||
Prefix string `orm:"size(255)" json:"prefix"`
|
Prefix string `orm:"size(255)" json:"prefix"`
|
||||||
Name string `orm:"size(255)" json:"name"`
|
Name string `orm:"size(255);index" json:"name"`
|
||||||
Comment string `orm:"size(255)" json:"comment"`
|
Comment string `orm:"size(255)" json:"comment"`
|
||||||
|
|
||||||
BrandID int `orm:"column(brand_id);default(0)" json:"brandID"` // 此属性暂时没有使用
|
BrandID int `orm:"column(brand_id);default(0)" json:"brandID"` // 此属性暂时没有使用
|
||||||
CategoryID int `orm:"column(category_id)" json:"categoryID"` // 标准类别
|
CategoryID int `orm:"column(category_id);index" json:"categoryID"` // 标准类别
|
||||||
|
|
||||||
IsGlobal int8 `orm:"default(1)" json:"isGlobal"` // 是否是全部(全国)可见,如果否的话,可见性由SkuPlace决定
|
IsGlobal int8 `orm:"default(1)" json:"isGlobal"` // 是否是全部(全国)可见,如果否的话,可见性由SkuPlace决定
|
||||||
Unit string `orm:"size(8)" json:"unit"`
|
Unit string `orm:"size(8)" json:"unit"`
|
||||||
@@ -159,42 +160,12 @@ func (*Sku) TableUnique() [][]string {
|
|||||||
type SkuNamePlaceBind struct {
|
type SkuNamePlaceBind struct {
|
||||||
ModelIDCUL
|
ModelIDCUL
|
||||||
|
|
||||||
SkuNameID int `orm:"column(sku_name_id)"`
|
NameID int `orm:"column(name_id)"`
|
||||||
PlaceCode int
|
PlaceCode int
|
||||||
}
|
}
|
||||||
|
|
||||||
func (*SkuNamePlaceBind) TableUnique() [][]string {
|
func (*SkuNamePlaceBind) TableUnique() [][]string {
|
||||||
return [][]string{
|
return [][]string{
|
||||||
[]string{"SkuNameID", "PlaceCode"},
|
[]string{"NameID", "PlaceCode"},
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 以下为门店相关数据
|
|
||||||
type StoreSkuCategoryMap struct {
|
|
||||||
ModelIDCUL
|
|
||||||
|
|
||||||
StoreID int `orm:"column(store_id)"`
|
|
||||||
SkuCategoryID int `orm:"column(sku_category_id)"`
|
|
||||||
|
|
||||||
ElmID int64 `orm:"column(elm_id);index"`
|
|
||||||
EbaiID int64 `orm:"column(ebai_id);index"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type StoreSkuBind struct {
|
|
||||||
ModelIDCUL
|
|
||||||
|
|
||||||
StoreID int `orm:"column(store_id)"`
|
|
||||||
SkuID int `orm:"column(sku_id)"`
|
|
||||||
SubStoreID int `orm:"column(sub_store_id)"`
|
|
||||||
Price int // 单位为分,不用int64的原因是这里不需要累加
|
|
||||||
Status int
|
|
||||||
|
|
||||||
ElmID int64 `orm:"column(elm_id);index"`
|
|
||||||
EbaiID int64 `orm:"column(ebai_id);index"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (*StoreSkuBind) TableUnique() [][]string {
|
|
||||||
return [][]string{
|
|
||||||
[]string{"StoreID", "SkuID"},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
30
business/model/store_sku.go
Normal file
30
business/model/store_sku.go
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
package model
|
||||||
|
|
||||||
|
type StoreSkuCategoryMap struct {
|
||||||
|
ModelIDCUL
|
||||||
|
|
||||||
|
StoreID int `orm:"column(store_id)"`
|
||||||
|
SkuCategoryID int `orm:"column(sku_category_id)"`
|
||||||
|
|
||||||
|
ElmID int64 `orm:"column(elm_id);index"`
|
||||||
|
EbaiID int64 `orm:"column(ebai_id);index"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type StoreSkuBind struct {
|
||||||
|
ModelIDCUL
|
||||||
|
|
||||||
|
StoreID int `orm:"column(store_id)"`
|
||||||
|
SkuID int `orm:"column(sku_id)"`
|
||||||
|
SubStoreID int `orm:"column(sub_store_id)"`
|
||||||
|
Price int // 单位为分,不用int64的原因是这里不需要累加
|
||||||
|
Status int
|
||||||
|
|
||||||
|
ElmID int64 `orm:"column(elm_id);index"`
|
||||||
|
EbaiID int64 `orm:"column(ebai_id);index"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*StoreSkuBind) TableUnique() [][]string {
|
||||||
|
return [][]string{
|
||||||
|
[]string{"StoreID", "SkuID"},
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -189,7 +189,8 @@ func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuName *model.SkuName, s
|
|||||||
shopCategories := utils.Interface2Int64List(mapData["shopCategories"])
|
shopCategories := utils.Interface2Int64List(mapData["shopCategories"])
|
||||||
if len(shopCategories) > 0 {
|
if len(shopCategories) > 0 {
|
||||||
skuCat := &model.SkuCategory{}
|
skuCat := &model.SkuCategory{}
|
||||||
if dao.GetRow(db, skuCat, "SELECT * FROM sku_category WHERE jd_id = ?", shopCategories[0]) == nil {
|
skuCat.JdID = shopCategories[0]
|
||||||
|
if dao.GetEntity(db, skuCat, "JdID") == nil {
|
||||||
skuName.CategoryID = skuCat.ID
|
skuName.CategoryID = skuCat.ID
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ func TestUpdateSku(t *testing.T) {
|
|||||||
sku.ID = skuID
|
sku.ID = skuID
|
||||||
dao.GetEntity(nil, sku)
|
dao.GetEntity(nil, sku)
|
||||||
|
|
||||||
err := new(PurchaseHandler).UpdateSku(sku)
|
err := new(PurchaseHandler).UpdateSku(sku, "autotest")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err.Error())
|
t.Fatal(err.Error())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ func (c *SkuController) GetSkuNames() {
|
|||||||
// @Title 新增商品名(及商品)信息
|
// @Title 新增商品名(及商品)信息
|
||||||
// @Description 新增商品名(及商品)信息
|
// @Description 新增商品名(及商品)信息
|
||||||
// @Param token header string true "认证token"
|
// @Param token header string true "认证token"
|
||||||
// @Param payload formData string true "json数据,SkuNameExt对象(),可传Skus"
|
// @Param payload formData string true "json数据,SkuNameExt对象(),可传Skus及Places"
|
||||||
// @Success 200 {object} controllers.CallResult
|
// @Success 200 {object} controllers.CallResult
|
||||||
// @Failure 200 {object} controllers.CallResult
|
// @Failure 200 {object} controllers.CallResult
|
||||||
// @router /AddSkuName [post]
|
// @router /AddSkuName [post]
|
||||||
@@ -162,7 +162,7 @@ func (c *SkuController) AddSkuName() {
|
|||||||
// @Description 修改商品名信息
|
// @Description 修改商品名信息
|
||||||
// @Param token header string true "认证token"
|
// @Param token header string true "认证token"
|
||||||
// @Param nameID formData int true "需要修改的商品名ID,payload中的相应数据会被忽略"
|
// @Param nameID formData int true "需要修改的商品名ID,payload中的相应数据会被忽略"
|
||||||
// @Param payload formData string true "json数据,SkuNameExt对象(),Skus无效"
|
// @Param payload formData string true "json数据,SkuNameExt对象(),Skus, Places无效"
|
||||||
// @Success 200 {object} controllers.CallResult
|
// @Success 200 {object} controllers.CallResult
|
||||||
// @Failure 200 {object} controllers.CallResult
|
// @Failure 200 {object} controllers.CallResult
|
||||||
// @router /UpdateSkuName [put]
|
// @router /UpdateSkuName [put]
|
||||||
@@ -239,3 +239,33 @@ func (c *SkuController) DeleteSku() {
|
|||||||
return retVal, "", err
|
return retVal, "", err
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @Title 新增商品名可售地点绑定
|
||||||
|
// @Description 新增商品名可售地点绑定
|
||||||
|
// @Param token header string true "认证token"
|
||||||
|
// @Param nameID formData int true "商品名ID"
|
||||||
|
// @Param placeCode formData int true "地点代码"
|
||||||
|
// @Success 200 {object} controllers.CallResult
|
||||||
|
// @Failure 200 {object} controllers.CallResult
|
||||||
|
// @router /AddSkuNamePlace [post]
|
||||||
|
func (c *SkuController) AddSkuNamePlace() {
|
||||||
|
c.callAddSkuNamePlace(func(params *tSkuAddSkuNamePlaceParams) (retVal interface{}, errCode string, err error) {
|
||||||
|
retVal, err = cms.AddSkuNamePlace(params.NameID, params.PlaceCode, GetUserNameFromToken(params.Token))
|
||||||
|
return retVal, "", err
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Title 删除商品
|
||||||
|
// @Description 删除商品
|
||||||
|
// @Param token header string true "认证token"
|
||||||
|
// @Param nameID query int true "商品名ID"
|
||||||
|
// @Param placeCode query int true "地点代码"
|
||||||
|
// @Success 200 {object} controllers.CallResult
|
||||||
|
// @Failure 200 {object} controllers.CallResult
|
||||||
|
// @router /DeleteSkuNamePlace [delete]
|
||||||
|
func (c *SkuController) DeleteSkuNamePlace() {
|
||||||
|
c.callDeleteSkuNamePlace(func(params *tSkuDeleteSkuNamePlaceParams) (retVal interface{}, errCode string, err error) {
|
||||||
|
retVal, err = cms.DeleteSkuNamePlace(params.NameID, params.PlaceCode, GetUserNameFromToken(params.Token))
|
||||||
|
return retVal, "", err
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -159,6 +159,14 @@ func init() {
|
|||||||
MethodParams: param.Make(),
|
MethodParams: param.Make(),
|
||||||
Params: nil})
|
Params: nil})
|
||||||
|
|
||||||
|
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
|
||||||
|
beego.ControllerComments{
|
||||||
|
Method: "AddSkuNamePlace",
|
||||||
|
Router: `/AddSkuNamePlace`,
|
||||||
|
AllowHTTPMethods: []string{"post"},
|
||||||
|
MethodParams: param.Make(),
|
||||||
|
Params: nil})
|
||||||
|
|
||||||
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
|
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
|
||||||
beego.ControllerComments{
|
beego.ControllerComments{
|
||||||
Method: "DeleteCategory",
|
Method: "DeleteCategory",
|
||||||
@@ -183,6 +191,14 @@ func init() {
|
|||||||
MethodParams: param.Make(),
|
MethodParams: param.Make(),
|
||||||
Params: nil})
|
Params: nil})
|
||||||
|
|
||||||
|
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
|
||||||
|
beego.ControllerComments{
|
||||||
|
Method: "DeleteSkuNamePlace",
|
||||||
|
Router: `/DeleteSkuNamePlace`,
|
||||||
|
AllowHTTPMethods: []string{"delete"},
|
||||||
|
MethodParams: param.Make(),
|
||||||
|
Params: nil})
|
||||||
|
|
||||||
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
|
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
|
||||||
beego.ControllerComments{
|
beego.ControllerComments{
|
||||||
Method: "GetCategories",
|
Method: "GetCategories",
|
||||||
|
|||||||
Reference in New Issue
Block a user