Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

model/gmodel/fs_order_detail_logic.go

@@ -11,3 +11,10 @@ func (od *FsOrderDetailModel) GetOrderDetailsByOrderId(ctx context.Context, orde
 	}
 	return
 }
+func (od *FsOrderDetailModel) FindOneByOrderDetailTemplateId(ctx context.Context, templateId int64) (resp *FsOrderDetail, err error) {
+	err = od.db.WithContext(ctx).Model(&FsOrderDetail{}).Where("`order_detail_template_id` = ?", templateId).Take(&resp).Error
+	return resp, err
+}
+func (od *FsOrderDetailModel) Create(ctx context.Context, data *FsOrderDetail) error {
+	return od.db.WithContext(ctx).Model(&FsOrderDetail{}).Create(&data).Error
+}

model/gmodel/fs_order_detail_template_logic.go

@@ -14,3 +14,10 @@ func (dt *FsOrderDetailTemplateModel) GetListByIds(ctx context.Context, ids []in
 	}
 	return
 }
+func (dt *FsOrderDetailTemplateModel) FindOneBySn(ctx context.Context, sn string) (resp *FsOrderDetailTemplate, err error) {
+	err = dt.db.WithContext(ctx).Model(&FsOrderDetailTemplate{}).Where("`sn` = ?", sn).Take(&resp).Error
+	return resp, err
+}
+func (dt *FsOrderDetailTemplateModel) Create(ctx context.Context, data *FsOrderDetailTemplate) error {
+	return dt.db.WithContext(ctx).Model(&FsOrderDetailTemplate{}).Create(&data).Error
+}

model/gmodel/fs_order_logic.go

@@ -12,7 +12,7 @@ func (o *FsOrderModel) FindOneBySn(ctx context.Context, userId int64, sn string)
 }
 
 func (o *FsOrderModel) FindOne(ctx context.Context, userId int64, OrderId int64) (order *FsOrder, err error) {
-	err = o.db.WithContext(ctx).Model(&order).Where("`user_id` = ? and `id` = ?", userId, OrderId).Take(&order).Error
+	err = o.db.WithContext(ctx).Model(&FsOrder{}).Where("`user_id` = ? and `id` = ?", userId, OrderId).Take(&order).Error
 	if err != nil {
 		return nil, err
 	}
@@ -20,7 +20,11 @@ func (o *FsOrderModel) FindOne(ctx context.Context, userId int64, OrderId int64)
 }
 
 func (o *FsOrderModel) Update(ctx context.Context, data *FsOrder) error {
-	return o.db.WithContext(ctx).Model(data).Where("`id` = ?", data.Id).Updates(data).Error
+	return o.db.WithContext(ctx).Model(&FsOrder{}).Where("`id` = ?", data.Id).Updates(&data).Error
+}
+
+func (o *FsOrderModel) Create(ctx context.Context, data *FsOrder) error {
+	return o.db.WithContext(ctx).Model(&FsOrder{}).Create(&data).Error
 }
 
 func (o *FsOrderModel) FindOneAndCreateServiceContact(ctx context.Context, userId int64, OrderId int64) (order *FsOrder, err error) {

model/gmodel/fs_product_design_logic.go

@@ -18,3 +18,13 @@ func (d *FsProductDesignModel) GetAllByIds(ctx context.Context, ids []int64) (re
 	}
 	return
 }
+func (d *FsProductDesignModel) GetAllByIdsWithoutStatus(ctx context.Context, ids []int64) (resp []FsProductDesign, err error) {
+	if len(ids) == 0 {
+		return
+	}
+	err = d.db.WithContext(ctx).Model(&FsProductDesign{}).Where("`id` in (?)", ids).Find(&resp).Error
+	if err != nil {
+		return nil, err
+	}
+	return
+}

model/gmodel/fs_product_size_logic.go

@@ -48,11 +48,11 @@ func (s *FsProductSizeModel) GetAllByProductIds(ctx context.Context, productIds
 	}
 	return
 }
-func (s *FsProductSizeModel) GetAllByProductIdsWithoutStatus(ctx context.Context, productIds []int64, sort string) (resp []FsProductSize, err error) {
-	if len(productIds) == 0 {
+func (s *FsProductSizeModel) GetAllByIdsWithoutStatus(ctx context.Context, ids []int64, sort string) (resp []FsProductSize, err error) {
+	if len(ids) == 0 {
 		return nil, nil
 	}
-	db := s.db.WithContext(ctx).Model(&FsProductSize{}).Where("`product_id` in(?)", productIds)
+	db := s.db.WithContext(ctx).Model(&FsProductSize{}).Where("`id` in(?)", ids)
 	switch sort {
 	case "sort-asc":
 		db = db.Order("`sort` ASC")

model/gmodel/fs_user_stock_logic.go

@@ -1,6 +1,8 @@
 package gmodel
 
-import "context"
+import (
+	"context"
+)
 
 // TODO: 使用model的属性做你想做的
 type GetStockListReq struct {