- skuName place bind man.

2018-09-12 23:15:54 +08:00
parent ecd19c55b3
commit f14112c030
14 changed files with 173 additions and 68 deletions
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -15,6 +15,9 @@ type SkuNameExt struct {
 	model.SkuName
 	Skus    []*model.Sku `orm:"-" json:"skus"`
 	SkusStr string       `orm:"size(2000)" json:"-"`
+
+	Places    []*model.SkuNamePlaceBind `orm:"-" json:"places"`
+	PlacesStr string                    `orm:"size(2000)" json:"-"`
 }

 type SkuNamesInfo struct {
@@ -125,7 +128,7 @@ func DeleteCategory(categoryID int, isForce bool, userName string) (num int64, e
 		} else if countInfos[2].Ct != 0 {
 			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)
 		}
 	}
@@ -136,6 +139,7 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
 	sql := `
 	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_name_place_bind t3 ON t1.id = t3.name_id
 	WHERE t1.deleted_at = '1970-01-01 00:00:00'`
 	sqlParams := make([]interface{}, 0)
 	if keyword != "" {
@@ -181,7 +185,7 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
 			sql += " AND ( 1 = 0"
 		}
 		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))
 		}
 		if params["isGlobal"] != nil {
@@ -240,7 +244,8 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
 		t1.price,
 		t1.img,
 		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 + `
 	ORDER BY t1.id
 	LIMIT ? OFFSET ?`
@@ -263,6 +268,11 @@ func GetSkuNames(keyword string, params map[string]interface{}, offset, pageSize
 						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
 		}
 	}
+	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)
 	tmpInfo, err := GetSkuNames("", utils.Params2Map("id", skuNameExt.SkuName.ID), 0, 1)
 	if err != nil {
@@ -326,7 +344,7 @@ func DeleteSkuName(nameID int, userName string) (num int64, err error) {
 	dao.Begin(db)
 	skuName := &model.SkuName{}
 	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{}
 		num2, err2 := dao.UpdateEntityByKV(db, dummy, map[string]interface{}{
 			model.FieldDeletedAt:    time.Now(),
@@ -387,7 +405,7 @@ func DeleteSku(skuID int, userName string) (num int64, err error) {
 	db := dao.GetDB()
 	sku := &model.Sku{}
 	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 {
 			err = CurVendorSync.SyncSku(db, -1, sku.ID, false, userName)
 		} else {
@@ -396,3 +414,31 @@ func DeleteSku(skuID int, userName string) (num int64, err error) {
 	}
 	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
+}
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -97,7 +97,7 @@ func GetStores(keyword string, params map[string]interface{}, offset, pageSize i

 	if params["storeID"] != nil {
 		sqlWhere += " AND t1.id = ?"
-		sqlParams = append(sqlParams, params["storeID"].(int))
+		sqlParams = append(sqlParams, params["id"].(int))
 	}
 	if params["name"] != nil {
 		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) {
-	storeMap := &model.StoreMap{}
-	return dao.DeleteEntity(db, storeMap, utils.Params2Map(model.FieldStoreID, storeID, model.FieldVendorID, vendorID), "", nil)
+	storeMap := &model.StoreMap{
+		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) {