- DeleteCategory added.

business/model/dao/dao.go

@@ -147,7 +147,7 @@ func CreateEntity(db *DaoDB, item interface{}) (err error) {
 }
 
 // 如果logicDeletedBy不为空，表示逻辑删除，否则物理删除
-func DeleteEntity(db *DaoDB, item interface{}, conditions map[string]interface{}, logicDeletedBy 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()
 	}
@@ -161,11 +161,17 @@ func DeleteEntity(db *DaoDB, item interface{}, conditions map[string]interface{}
 			}
 		}
 		if logicDeletedBy != "" {
-			num, err = qs.Update(utils.Params2Map(model.FieldDeletedAt, time.Now(), model.FieldUpdatedAt, time.Now(), model.FieldLastOperator, logicDeletedBy))
+			qs = qs.Filter(model.FieldDeletedAt, utils.DefaultTimeValue)
+			updateValues := map[string]interface{}{
+				model.FieldDeletedAt:    time.Now(),
+				model.FieldUpdatedAt:    time.Now(),
+				model.FieldLastOperator: logicDeletedBy,
+			}
+			num, err = qs.Update(utils.MergeMaps(updateValues, kvs))
 		} else {
 			num, err = qs.Delete()
 		}
 		return err
 	}, reflect.TypeOf(item).Name())
-	return 0, err
+	return num, err
 }

business/model/model.go

@@ -6,9 +6,16 @@ import (
 
 const (
 	FieldID           = "ID"
+	FieldParentID     = "ParentID"
 	FieldDeletedAt    = "DeletedAt"
 	FieldUpdatedAt    = "UpdatedAt"
 	FieldLastOperator = "LastOperator"
+	FieldSyncStatus   = "SyncStatuss"
+	FieldJdSyncStatus = "JdSyncStatus"
+
+	FieldVendorID      = "VendorID"
+	FieldStoreID       = "StoreID"
+	FieldVendorStoreID = "VendorStoreID"
 )
 
 type ModelIDCUL struct {