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

server/canteen/internal/logic/getcanteendetaillogic.go

@@ -2,12 +2,14 @@ package logic
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"fusenapi/model/gmodel"
 	"fusenapi/server/canteen/internal/svc"
 	"fusenapi/server/canteen/internal/types"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"gorm.io/gorm"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -35,12 +37,12 @@ func (l *GetCanteenDetailLogic) GetCanteenDetail(req *types.GetCanteenDetailReq,
 	canteenTypeModel := gmodel.NewFsCanteenTypeModel(l.svcCtx.MysqlConn)
 	canteenTypeInfo, err := canteenTypeModel.FindOne(l.ctx, req.Id)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "canteen type is not exists ")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get canteen type info ")
 	}
-	if canteenTypeInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "canteen type is not exists ")
-	}
 	//获取餐厅类型关联的所有产品
 	canteenProductModel := gmodel.NewFsCanteenProductModel(l.svcCtx.MysqlConn)
 	canteenProductList, err := canteenProductModel.GetAllByCanteenTypeId(l.ctx, req.Id)

server/data-transfer/internal/logic/uploadqrcodelogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"errors"
 	"fusenapi/model/gmodel"
 	"fusenapi/server/data-transfer/internal/svc"
 	"fusenapi/server/data-transfer/internal/types"
@@ -9,6 +10,7 @@ import (
 	"fusenapi/utils/basic"
 	"fusenapi/utils/qrcode"
 	"github.com/zeromicro/go-zero/core/logx"
+	"gorm.io/gorm"
 	"strings"
 )
 
@@ -41,12 +43,12 @@ func (l *UploadQrcodeLogic) UploadQrcode(req *types.UploadQrcodeReq, userinfo *a
 	qrCodeModel := gmodel.NewFsQrcodeSetModel(l.svcCtx.MysqlConn)
 	qrCodeSet, err := qrCodeModel.FindOne(l.ctx, req.QRcodeType)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "qrcode setting is not exists")
+		}
 		logx.Error(err)
 		resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get qrcode setting")
 	}
-	if qrCodeSet.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "qrcode setting is not exists")
-	}
 	qrType := *qrCodeSet.SvgWebsite
 	if strings.Contains(req.Url, "www.instagram.com") {
 		qrType = *qrCodeSet.SvgInstagram

server/orders/internal/logic/getorderdetaillogic.go

@@ -1,12 +1,14 @@
 package logic
 
 import (
+	"errors"
 	"fmt"
 	"fusenapi/constants"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/order"
+	"gorm.io/gorm"
 	"strings"
 	"time"
 
@@ -37,23 +39,23 @@ func (l *GetOrderDetailLogic) GetOrderDetail(req *types.GetOrderDetailReq, useri
 	orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn)
 	orderInfo, err := orderModel.FindOneBySn(l.ctx, userinfo.UserId, req.Sn)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "the order is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatus(basic.CodeServiceErr, "failed to get order info")
 	}
-	if orderInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "the order is not exists")
-	}
 	address := types.Address{}
 	//直接邮寄才有地址信息
-	if *orderInfo.DeliveryMethod == constants.DELIVERY_METHOD_ADDRESS {
+	if *orderInfo.DeliveryMethod == int64(constants.DELIVERY_METHOD_ADDRESS) {
 		addressInfo, err := gmodel.NewFsAddressModel(l.svcCtx.MysqlConn).GetOne(l.ctx, *orderInfo.AddressId, userinfo.UserId)
 		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "address not exists")
+			}
 			logx.Error(err)
 			return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get address info")
 		}
-		if addressInfo.Id == 0 {
-			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "address not exists")
-		}
 		address.Id = addressInfo.Id
 		address.UserId = *addressInfo.UserId
 		address.Name = *addressInfo.Name
@@ -145,7 +147,7 @@ func (l *GetOrderDetailLogic) GetOrderDetail(req *types.GetOrderDetailReq, useri
 		mapPay[*v.PayStage] = k
 	}
 	//处理订单状态
-	orderStatus := order.GetOrderStatus(*orderInfo.Status, *orderInfo.DeliveryMethod)
+	orderStatus := order.GetOrderStatus(constants.Order(*orderInfo.Status), constants.DeliveryMethod(*orderInfo.DeliveryMethod))
 	//组装
 	productListRsp := make([]types.Product, 0, len(orderDetails))
 	for _, v := range orderDetails {
@@ -194,7 +196,7 @@ func (l *GetOrderDetailLogic) GetOrderDetail(req *types.GetOrderDetailReq, useri
 		IsPayCompleted: *orderInfo.IsPayCompleted,
 		DeliveryMethod: *orderInfo.DeliveryMethod,
 		Sn:             *orderInfo.Sn,
-		Status:         orderStatus,
+		Status:         int64(orderStatus),
 		Ctime:          time.Unix(*orderInfo.Ctime, 0).Format("2006-01-02 15:04:05"),
 		PayInfo:        types.PayInfo{},
 		Address:        address,

server/orders/internal/logic/getorderinvoicelogic.go

@@ -2,12 +2,14 @@ package logic
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"fusenapi/constants"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/pdf"
+	"gorm.io/gorm"
 	"strings"
 	"time"
 
@@ -54,12 +56,12 @@ func (l *GetOrderInvoiceLogic) GetOrderInvoice(req *types.GetOrderInvoiceReq, us
 	orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn)
 	orderInfo, err := orderModel.FindOneBySn(l.ctx, userinfo.UserId, req.Sn)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "the order is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get order info")
 	}
-	if orderInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "order is not exists")
-	}
 	//地址数据
 	var address gmodel.FsAddress
 	if err = json.Unmarshal([]byte(*orderInfo.AddressInfo), &address); err != nil {

server/product/internal/logic/getproductdesignlogic.go

@@ -1,9 +1,11 @@
 package logic
 
 import (
+	"errors"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"gorm.io/gorm"
 
 	"context"
 
@@ -38,42 +40,42 @@ func (l *GetProductDesignLogic) GetProductDesign(req *types.GetProductDesignReq,
 	productDesignModel := gmodel.NewFsProductDesignModel(l.svcCtx.MysqlConn)
 	designInfo, err := productDesignModel.FindOneBySn(l.ctx, req.Sn, userinfo.UserId)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "design info is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get design info")
 	}
-	if designInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "design info is not exists")
-	}
 	//获取产品尺寸信息
 	productSizeModel := gmodel.NewFsProductSizeModel(l.svcCtx.MysqlConn)
 	sizeInfo, err := productSizeModel.FindOne(l.ctx, *designInfo.SizeId)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "product size info is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product size info")
 	}
-	if sizeInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "product size info is not exists")
-	}
 	//获取模板信息
 	productTemplateV2Model := gmodel.NewFsProductTemplateV2Model(l.svcCtx.MysqlConn)
 	productTemplateV2Info, err := productTemplateV2Model.FindOne(l.ctx, *designInfo.TemplateId)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "template info is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get template info")
 	}
-	if productTemplateV2Info.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "template info is not exists")
-	}
 	//获取产品模型信息
 	productModel3dModel := gmodel.NewFsProductModel3dModel(l.svcCtx.MysqlConn)
 	model3dInfo, err := productModel3dModel.FindOne(l.ctx, *designInfo.OptionalId)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "product 3D model info is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product 3D model info")
 	}
-	if model3dInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "product 3D model info is not exists")
-	}
 	optionalId := *designInfo.OptionalId
 	if *model3dInfo.Status == 0 && *sizeInfo.Status == 1 && *productTemplateV2Info.Status == 1 && *productTemplateV2Info.IsDel == 0 {
 		optionalId = 0

server/product/internal/logic/getproductlistlogic.go

@@ -14,6 +14,7 @@ import (
 	"fusenapi/utils/image"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/stores/sqlc"
+	"gorm.io/gorm"
 	"sort"
 	"strings"
 )
@@ -115,12 +116,12 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, useri
 	tagsModel := gmodel.NewFsTagsModel(l.svcCtx.MysqlConn)
 	tagInfo, err := tagsModel.FindOne(l.ctx, req.Cid)
 	if err != nil && !errors.Is(err, sqlc.ErrNotFound) {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "tag is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "get tag err")
 	}
-	if tagInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "tag is not exists")
-	}
 	//获取产品尺寸数量
 	productSizeModel := gmodel.NewFsProductSizeModel(l.svcCtx.MysqlConn)
 	productSizeCount, err := productSizeModel.CountByStatus(l.ctx, 1)

server/shopping-cart-confirmation/internal/logic/cartaddlogic.go

@@ -1,9 +1,11 @@
 package logic
 
 import (
+	"errors"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"gorm.io/gorm"
 	"strings"
 	"time"
 
@@ -48,12 +50,12 @@ func (l *CartAddLogic) CartAdd(req *types.CartAddReq, userinfo *auth.UserInfo) (
 	productDesignModel := gmodel.NewFsProductDesignModel(l.svcCtx.MysqlConn)
 	productDesignInfo, err := productDesignModel.FindOneBySn(l.ctx, req.DesignId, userinfo.UserId)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "design info is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product design info")
 	}
-	if productDesignInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "product design info is not exists")
-	}
 	//查找是否有此材质、产品、大小id的阶梯价格
 	productPriceModel := gmodel.NewFsProductPriceModel(l.svcCtx.MysqlConn)
 	priceStatus := int64(1)
@@ -94,7 +96,7 @@ func (l *CartAddLogic) CartAdd(req *types.CartAddReq, userinfo *auth.UserInfo) (
 		Status:     &cartStatus,
 	}
 	cartInfo, err := cartModel.FindOneCartByParams(l.ctx, cartReq)
-	if err != nil {
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get cart info")
 	}
@@ -116,7 +118,7 @@ func (l *CartAddLogic) CartAdd(req *types.CartAddReq, userinfo *auth.UserInfo) (
 		IsCheck:    &req.IsCheck,
 		TsTime:     &nowTime,
 	}
-	if cartInfo.Id == 0 {
+	if cartInfo == nil {
 		err = cartModel.Create(l.ctx, data)
 	} else {
 		err = cartModel.Update(l.ctx, cartInfo.Id, data)

server/shopping-cart-confirmation/internal/logic/cartorderdetaillogic.go

@@ -1,10 +1,12 @@
 package logic
 
 import (
+	"errors"
 	"fmt"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"gorm.io/gorm"
 	"strings"
 	"time"
 
@@ -42,12 +44,12 @@ func (l *CartOrderDetailLogic) CartOrderDetail(req *types.CartOrderDetailReq, us
 	orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn)
 	orderInfo, err := orderModel.FindOneBySn(l.ctx, userinfo.UserId, req.Sn)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "the order is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get order info")
 	}
-	if orderInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "the order is not exists")
-	}
 	//获取订单详细数据
 	orderDetailModel := gmodel.NewFsOrderDetailModel(l.svcCtx.MysqlConn)
 	orderDetailList, err := orderDetailModel.GetOrderDetailsByOrderId(l.ctx, orderInfo.Id)

server/shopping-cart-confirmation/internal/logic/changeordermethodlogic.go

@@ -2,9 +2,11 @@ package logic
 
 import (
 	"encoding/json"
+	"errors"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"gorm.io/gorm"
 	"strings"
 
 	"context"
@@ -41,12 +43,12 @@ func (l *ChangeOrderMethodLogic) ChangeOrderMethod(req *types.ChangeOrderMethodR
 	orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn)
 	orderInfo, err := orderModel.FindOneBySn(l.ctx, userinfo.UserId, req.Sn)
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "the order is not exists")
+		}
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get order info")
 	}
-	if orderInfo.Id == 0 {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "the order is not exists")
-	}
 	if *orderInfo.PayedAmount > 0 {
 		return resp.SetStatusWithMessage(basic.CodeApiErr, "the order`s address cannot be changed for it is paid")
 	}
@@ -56,12 +58,12 @@ func (l *ChangeOrderMethodLogic) ChangeOrderMethod(req *types.ChangeOrderMethodR
 		addressModel := gmodel.NewFsAddressModel(l.svcCtx.MysqlConn)
 		addr, err := addressModel.GetOne(l.ctx, req.AddressId, userinfo.UserId)
 		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return resp.SetStatusWithMessage(basic.CodeServiceErr, "address is not exists")
+			}
 			logx.Error(err)
 			return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get address info")
 		}
-		if addr.Id == 0 {
-			return resp.SetStatusWithMessage(basic.CodeServiceErr, "address is not exists")
-		}
 		infoJsonByte, _ := json.Marshal(addr)
 		strInfoJson := string(infoJsonByte)
 		updData.AddressInfo = &strInfoJson