Compare commits

..

No commits in common. "190faad47f91910cafada619d984eea17fe09cfa" and "8febf219f7903862291905dccc345e6a1c74d0bf" have entirely different histories.

View File

@ -699,17 +699,12 @@ func DeleteValueAddService(req *bundle.DeleteValueAddServiceRequest) (res *bundl
Where("order_no = ? and customer_id = ?", req.OrderNo, req.UserID).
First(&order).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil
}
} else if order.PayType == 2 {
res.Msg = "订单已支付,无法删除"
return res, nil
}
if err = app.ModuleClients.BundleDB.Where("order_no = ?", order.OrderNo).
Delete(&model.BundleOrderRecords{}).Error; err != nil {
res.Msg = msg.ErrorDeleteOrderInfo
return res, commonErr.ReturnError(err, msg.ErrorDeleteOrderInfo, "删除套餐订单服务失败: ")
}
res.Msg = msg.SuccessDeletedOrderInfo
return res, nil
}