新增接口

business/api/control.go

@@ -31,9 +31,9 @@ func (p DefParty) RegisterList() []web_iris.Party {
 		p.orderEdit(),
 		p.orderDetail(),
 		p.orderGoodsUpdate(),
-		p.orderPay(),
 		p.orderCancel(),
 		p.orderCreatePreCheck(),
+		p.orderMarkRecord(),
 		//宠物
 		p.petList(),
 		p.petInfo(),
@@ -44,6 +44,7 @@ func (p DefParty) RegisterList() []web_iris.Party {
 		p.serviceAddrList(),
 		p.serviceAddOrEdit(),
 		p.serviceAreaAddrList(),
+		p.serviceCarLocationUpload(),
 		//车辆
 		p.carServiceOrderList(),
 		p.carServiceProcess(),

business/api/init.go

@@ -4,6 +4,7 @@ import (
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/context"
 	"go.uber.org/zap"
+	"pet-house.com/business/models"
 	"pet-house.com/business/utils"
 	"pet-house.com/core/server/database"
 	"pet-house.com/core/server/web/web_iris"
@@ -26,30 +27,31 @@ var frontExcludes = [...]string{
 func ModuleInit() {
 	utils.WechatInit()
 	_err := database.Instance().AutoMigrate(
-	//&models.User{},
+		//&models.User{},
-	//&models.Pet{},
+		//&models.Pet{},
-	//&models.PetBaseInfo{},
+		//&models.PetBaseInfo{},
-	//&models.ServiceAddr{},
+		//&models.ServiceAddr{},
-	//&models.UserServiceAddr{},
+		//&models.UserServiceAddr{},
-	//&models.Goods{},
+		//&models.Goods{},
-	//&models.PetGoods{},
+		//&models.PetGoods{},
-	//&models.SystemConfig{},
+		//&models.SystemConfig{},
-	//&models.OrderMain{},
+		//&models.OrderMain{},
-	//&models.OrderSub{},
+		//&models.OrderSub{},
-	//&models.OrderDetail{},
+		//&models.OrderDetail{},
-	//&models.ServiceCar{},
+		//&models.ServiceCar{},
-	//&models.CarOrder{},
+		//&models.CarOrder{},
-	//&models.ServiceCarUser{},
+		//&models.ServiceCarUser{},
-	//&models.ServiceUserMark{},
+		//&models.ServiceUserMark{},
-	//&models.ServiceUserMarkRecord{},
+		//&models.ServiceUserMarkRecord{},
-	//&models.ReserveTimeFilter{},
+		//&models.ReserveTimeFilter{},
-	//&models.OrderServiceRecord{},
+		//&models.OrderServiceRecord{},
-	//&models.AddrServiceTime{},
+		//&models.AddrServiceTime{},
-	//&models.UserAmountRecord{},
+		//&models.UserAmountRecord{},
-	//&models.Coupons{},
+		//&models.Coupons{},
-	//&models.UserCoupons{},
+		//&models.UserCoupons{},
-	//&models.RechargeInfo{},
+		//&models.RechargeInfo{},
-	//&models.PayOrder{},
+		//&models.PayOrder{},
+		&models.ServiceCarLocation{},
 	)
 	zap_server.ZAPLOG.Info("data init ", zap.Any("err", _err))
 	DataInit()

business/api/order.go

@@ -407,6 +407,7 @@ func GetOrderDetail(orderId string) OrderDetail {
 		Discount:       float64(orderMain.PayDiscount) / 100,
 		Uid:            orderMain.Uid,
 		UserAmount:     float64(userInfo.Amount) / 10.0,
+		MarkStatus:     orderMain.MarkStatus,
 	}
 
 	if orderMain.PayStatus == 1 {
@@ -572,6 +573,7 @@ type OrderDetail struct {
 	DiscountAmount string                 `json:"discountAmount"` //折扣金额
 	Uid            int64                  `json:"uid"`            //用户ID
 	UserAmount     float64                `json:"userAmount"`     //用户余额
+	MarkStatus     int                    `json:"markStatus"`     //订单是否已评价
 }
 
 type OrderListResponse struct {
@@ -614,6 +616,7 @@ func (p DefParty) orderList() web_iris.Party {
 					TotalAmount:    value.TotalAmount,
 					DiscountAmount: strconv.FormatFloat(float64(value.PayTotalAmount)/10.0, 'f', 1, 64),
 					Discount:       float64(value.PayDiscount / 100.0),
+					MarkStatus:     value.MarkStatus,
 				}
 				var subOrderList []SubOrder
 				var orderSubList []models.OrderSub
@@ -1122,6 +1125,15 @@ func (p DefParty) orderMarkRecord() web_iris.Party {
 				ServiceLabels: "4",
 				Status:        1,
 			}
+
+			var orderMain models.OrderMain
+			database.Instance().Model(&models.OrderMain{}).Where("order_id = ?", orderMarkRecordRequest.OrderId).Find(&orderMain)
+
+			updateValues1 := map[string]interface{}{
+				"MarkStatus": 1,
+			}
+			database.Instance().Model(&orderMain).Updates(&updateValues1)
+
 			database.Instance().Model(&models.ServiceUserMarkRecord{}).Create(&serviceUserMarkRecord4)
 			Success(ctx, orderMarkRecordRequest, nil)
 		})

business/api/service.go

@@ -153,3 +153,30 @@ func (p DefParty) serviceAreaAddrList() web_iris.Party {
 		})
 	}}
 }
+
+type ServiceCarLocationUploadRequest struct {
+	Longitude string //经度
+	Latitude  string //纬度
+}
+
+// 服务区域列表
+func (p DefParty) serviceCarLocationUpload() web_iris.Party {
+	return web_iris.Party{Prefix: p.Prefix, PartyFunc: func(index iris.Party) {
+		index.Post(ServiceBase+"/serviceCarLocationUpload", func(ctx *context.Context) {
+			headerBaseInfo := GetHeaderBaseInfo(ctx)
+			body, _ := io.ReadAll(ctx.Request().Body)
+			var serviceCarLocationUploadRequest ServiceCarLocationUploadRequest
+			json.Unmarshal(body, &serviceCarLocationUploadRequest)
+
+			serviceCarLocation := models.ServiceCarLocation{
+				Uid:       headerBaseInfo.Uid,
+				Longitude: serviceCarLocationUploadRequest.Longitude,
+				Latitude:  serviceCarLocationUploadRequest.Latitude,
+				Status:    1,
+			}
+			database.Instance().Model(&models.ServiceCarLocation{}).Create(&serviceCarLocation)
+			Success(ctx, serviceCarLocationUploadRequest, nil)
+
+		})
+	}}
+}

business/models/dataModel.go

@@ -334,3 +334,13 @@ type PayOrder struct {
 	UpdateTime  time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP" json:"-"` //更新时间
 	Status      int       `gorm:"default:1" json:"-"`                                                            //状态
 }
+
+// ServiceCarLocation 服务车辆定位
+type ServiceCarLocation struct {
+	Id         int       `gorm:"primaryKey;autoIncrement"`                                   //id
+	Uid        int64     `gorm:"not null" json:"uid"`                                        //用户ID
+	Longitude  string    `json:"longitude"`                                                  //经度
+	Latitude   string    `json:"latitude"`                                                   //纬度
+	CreateTime time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP" json:"createTime"` //创建时间
+	Status     int       `gorm:"default:1" json:"-"`                                         //状态
+}