1

api/service/HealthPackage.go

@@ -0,0 +1,30 @@
+package service
+
+import (
+	"errors"
+	"hospital-admin-api/api/dao"
+	"hospital-admin-api/api/dto"
+)
+
+type HealthPackageService struct {
+}
+
+// GetHealthPackage 获取系统健康包配置详情
+func (r *HealthPackageService) GetHealthPackage(packageId int64) (g *dto.HealthPackageDto, err error) {
+	healthPackageDao := dao.HealthPackageDao{}
+	healthPackage, err := healthPackageDao.GetHealthPackagePreloadById(packageId)
+	if err != nil || healthPackage == nil {
+		return nil, errors.New(err.Error())
+	}
+
+	// 获取健康包-关联商品
+	healthPackageProductDao := dao.HealthPackageProductDao{}
+	healthPackageProduct, err := healthPackageProductDao.GetHealthPackageProductByPackageId(packageId)
+
+	// 处理返回值
+	g = dto.GetHealthPackageDto(healthPackage)
+
+	g.LoadHealthPackageProduct(healthPackageProduct)
+
+	return g, nil
+}

api/service/orderServicePackage.go

@@ -301,7 +301,7 @@ func (r *OrderServicePackageService) CancelOrderServicePackage(req requests.Canc
 	orderServicePackageData["cancel_time"] = time.Now().Format("2006-01-02 15:04:05") // 订单取消时间
 	orderServicePackageData["cancel_reason"] = 4                                      // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
 	orderServicePackageData["cancel_remarks"] = req.CancelRemarks                     // 取消订单备注（自动添加）
-	err = orderServicePackageDao.EditOrderServicePackageById(tx, orderServiceId, orderServicePackageData)
+	err = orderServicePackageDao.EditOrderServicePackageById(tx, orderServicePackage.OrderId, orderServicePackageData)
 	if err != nil {
 		tx.Rollback()
 		return false, errors.New("取消订单失败")