- orderUseNewTable except store feature related.

business/model/dao/dao.go

@@ -57,6 +57,10 @@ func GetDB() *DaoDB {
 	return &DaoDB{db: orm.NewOrm()}
 }
 
+func WrapDB(ormDb orm.Ormer) *DaoDB {
+	return &DaoDB{db: ormDb}
+}
+
 func Begin(db *DaoDB) error {
 	return db.db.Begin()
 }

business/model/dao/dao_bz.go

@@ -116,7 +116,8 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 		StoreID:    storeID,
 		CategoryID: categoryID,
 	}
-	if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID); err != nil && err != orm.ErrNoRows {
+	storeCat.DeletedAt = utils.DefaultTimeValue
+	if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID, model.FieldDeletedAt); err != nil && err != orm.ErrNoRows {
 		return err
 	}
 	if vendorID == model.VendorIDEBAI {