Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/smithy/api_trade.go

@@ -1,6 +1,7 @@
 package smithy
 
 import (
+	"errors"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 )
@@ -27,7 +28,14 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err
 	this.module.ModuleEquipment.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId()))
 
 	cus, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
-	if err != nil {
+	var customErr = new(comm.CustomError)
+	if errors.As(err, &customErr) {
+		code := customErr.Code
+		errdata = &pb.ErrorData{
+			Code:       code,
+			Title:      code.ToString(),
+		}
+	} else {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),